kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix for errors in last commit (dilate/erode has no input)

Browse Source
This commit is contained in:
Campbell Barton 2012-06-16 14:11:30 +00:00
parent f6ab6514a3
commit e946fa443b
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/compositor/nodes/COM_DilateErodeNode.cpp
View File

@ -88,7 +88,7 @@ void DilateErodeNode::convertToOperations(ExecutionSystem *graph, CompositorCont
operationx->setData(data); operationx->setData(data);
operationx->setQuality(quality); operationx->setQuality(quality);
this->getInputSocket(0)->relinkConnections(operationx->getInputSocket(0), 0, graph); 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); graph->addOperation(operationx);
GaussianAlphaYBlurOperation *operationy = new GaussianAlphaYBlurOperation(); GaussianAlphaYBlurOperation *operationy = new GaussianAlphaYBlurOperation();
operationy->setData(data); operationy->setData(data);
@ -96,7 +96,7 @@ void DilateErodeNode::convertToOperations(ExecutionSystem *graph, CompositorCont
this->getOutputSocket(0)->relinkConnections(operationy->getOutputSocket()); this->getOutputSocket(0)->relinkConnections(operationy->getOutputSocket());
graph->addOperation(operationy); graph->addOperation(operationy);
addLink(graph, operationx->getOutputSocket(), operationy->getInputSocket(0)); 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()); addPreviewOperation(graph, operationy->getOutputSocket());
/* TODO? */ /* TODO? */

5
source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
View File

@ -158,6 +158,7 @@ void GaussianAlphaXBlurOperation::deinitExecution()
bool GaussianAlphaXBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output) bool GaussianAlphaXBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
{ {
rcti newInput; rcti newInput;
#if 0 /* until we add size input */
rcti sizeInput; rcti sizeInput;
sizeInput.xmin = 0; sizeInput.xmin = 0;
sizeInput.ymin = 0; sizeInput.ymin = 0;
@ -168,7 +169,9 @@ bool GaussianAlphaXBlurOperation::determineDependingAreaOfInterest(rcti *input,
if (operation->determineDependingAreaOfInterest(&sizeInput, readOperation, output)) { if (operation->determineDependingAreaOfInterest(&sizeInput, readOperation, output)) {
return true; return true;
} }
else { else
#endif
{
if (this->sizeavailable && this->gausstab != NULL) { if (this->sizeavailable && this->gausstab != NULL) {
newInput.xmax = input->xmax + rad; newInput.xmax = input->xmax + rad;
newInput.xmin = input->xmin - rad; newInput.xmin = input->xmin - rad;

5
source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
View File

@ -155,6 +155,7 @@ void GaussianAlphaYBlurOperation::deinitExecution()
bool GaussianAlphaYBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output) bool GaussianAlphaYBlurOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
{ {
rcti newInput; rcti newInput;
#if 0 /* until we add size input */
rcti sizeInput; rcti sizeInput;
sizeInput.xmin = 0; sizeInput.xmin = 0;
sizeInput.ymin = 0; sizeInput.ymin = 0;
@ -165,7 +166,9 @@ bool GaussianAlphaYBlurOperation::determineDependingAreaOfInterest(rcti *input,
if (operation->determineDependingAreaOfInterest(&sizeInput, readOperation, output)) { if (operation->determineDependingAreaOfInterest(&sizeInput, readOperation, output)) {
return true; return true;
} }
else { else
#endif
{
if (this->sizeavailable && this->gausstab != NULL) { if (this->sizeavailable && this->gausstab != NULL) {
newInput.xmax = input->xmax; newInput.xmax = input->xmax;
newInput.xmin = input->xmin; newInput.xmin = input->xmin;