forked from bartvdbraak/blender
fix for errors in last commit (dilate/erode has no input)
This commit is contained in:
parent
f6ab6514a3
commit
e946fa443b
@ -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? */
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user