From e946fa443b5aab057bfe5f40f8bb4f346c84331e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 16 Jun 2012 14:11:30 +0000 Subject: [PATCH] fix for errors in last commit (dilate/erode has no input) --- source/blender/compositor/nodes/COM_DilateErodeNode.cpp | 4 ++-- .../operations/COM_GaussianAlphaXBlurOperation.cpp | 5 ++++- .../operations/COM_GaussianAlphaYBlurOperation.cpp | 7 +++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp index 6584120bc75..326e0ad0c60 100644 --- a/source/blender/compositor/nodes/COM_DilateErodeNode.cpp +++ b/source/blender/compositor/nodes/COM_DilateErodeNode.cpp @@ -88,7 +88,7 @@ void DilateErodeNode::convertToOperations(ExecutionSystem *graph, CompositorCont operationx->setData(data); operationx->setQuality(quality); this->getInputSocket(0)->relinkConnections(operationx->getInputSocket(0), 0, graph); - this->getInputSocket(1)->relinkConnections(operationx->getInputSocket(1), 1, graph); + // this->getInputSocket(1)->relinkConnections(operationx->getInputSocket(1), 1, graph); // no size input yet graph->addOperation(operationx); GaussianAlphaYBlurOperation *operationy = new GaussianAlphaYBlurOperation(); operationy->setData(data); @@ -96,7 +96,7 @@ void DilateErodeNode::convertToOperations(ExecutionSystem *graph, CompositorCont this->getOutputSocket(0)->relinkConnections(operationy->getOutputSocket()); graph->addOperation(operationy); addLink(graph, operationx->getOutputSocket(), operationy->getInputSocket(0)); - addLink(graph, operationx->getInputSocket(1)->getConnection()->getFromSocket(), operationy->getInputSocket(1)); + // addLink(graph, operationx->getInputSocket(1)->getConnection()->getFromSocket(), operationy->getInputSocket(1)); // no size input yet addPreviewOperation(graph, operationy->getOutputSocket()); /* TODO? */ diff --git a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp index 5b042ae9d40..4a3fa7d5c12 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp @@ -158,6 +158,7 @@ void GaussianAlphaXBlurOperation::deinitExecution() bool GaussianAlphaXBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output) { rcti newInput; +#if 0 /* until we add size input */ rcti sizeInput; sizeInput.xmin = 0; sizeInput.ymin = 0; @@ -168,7 +169,9 @@ bool GaussianAlphaXBlurOperation::determineDependingAreaOfInterest(rcti *input, if (operation->determineDependingAreaOfInterest(&sizeInput, readOperation, output)) { return true; } - else { + else +#endif + { if (this->sizeavailable && this->gausstab != NULL) { newInput.xmax = input->xmax + rad; newInput.xmin = input->xmin - rad; diff --git a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp index 73dabda1e3f..f84f4e3b094 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp @@ -155,17 +155,20 @@ void GaussianAlphaYBlurOperation::deinitExecution() bool GaussianAlphaYBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output) { rcti newInput; +#if 0 /* until we add size input */ rcti sizeInput; sizeInput.xmin = 0; sizeInput.ymin = 0; sizeInput.xmax = 5; sizeInput.ymax = 5; - + NodeOperation *operation = this->getInputOperation(1); if (operation->determineDependingAreaOfInterest(&sizeInput, readOperation, output)) { return true; } - else { + else +#endif + { if (this->sizeavailable && this->gausstab != NULL) { newInput.xmax = input->xmax; newInput.xmin = input->xmin;