[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47990] trunk/blender/source/blender/ compositor: fix for errors in last commit (dilate/erode has no input)

[Campbell Barton]

Revision: 47990
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47990
Author:   campbellbarton
Date:     2012-06-16 14:11:30 +0000 (Sat, 16 Jun 2012)
Log Message:
-----------
fix for errors in last commit (dilate/erode has no input)

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
    trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp

Modified: trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.cpp	2012-06-16 13:51:18 UTC (rev 47989)
+++ trunk/blender/source/blender/compositor/nodes/COM_DilateErodeNode.cpp	2012-06-16 14:11:30 UTC (rev 47990)
@@ -88,7 +88,7 @@
 			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 @@
 			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? */

Modified: trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp	2012-06-16 13:51:18 UTC (rev 47989)
+++ trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp	2012-06-16 14:11:30 UTC (rev 47990)
@@ -158,6 +158,7 @@
 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 @@
 	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;

Modified: trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp	2012-06-16 13:51:18 UTC (rev 47989)
+++ trunk/blender/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp	2012-06-16 14:11:30 UTC (rev 47990)
@@ -155,17 +155,20 @@
 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;