[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47788] branches/soc-2011-tomato/source/ blender/compositor/nodes:

[Sergey Sharybin]

Revision: 47788
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47788
Author:   nazgul
Date:     2012-06-12 16:57:11 +0000 (Tue, 12 Jun 2012)
Log Message:
-----------

Fixed despill on keying node not using input socket for screen color properly

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_KeyingNode.cpp
    branches/soc-2011-tomato/source/blender/compositor/nodes/COM_KeyingNode.h

Modified: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_KeyingNode.cpp
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_KeyingNode.cpp	2012-06-12 14:59:36 UTC (rev 47787)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_KeyingNode.cpp	2012-06-12 16:57:11 UTC (rev 47788)
@@ -119,14 +119,14 @@
 	return dilateErodeOperation->getOutputSocket(0);
 }
 
-OutputSocket *KeyingNode::setupDespill(ExecutionSystem *graph, OutputSocket *despillInput, InputSocket *inputScreen, float factor)
+OutputSocket *KeyingNode::setupDespill(ExecutionSystem *graph, OutputSocket *despillInput, OutputSocket *inputScreen, float factor)
 {
 	KeyingDespillOperation *despillOperation = new KeyingDespillOperation();
 
 	despillOperation->setDespillFactor(factor);
 
 	addLink(graph, despillInput, despillOperation->getInputSocket(0));
-	inputScreen->relinkConnections(despillOperation->getInputSocket(1), 1, graph);
+	addLink(graph, inputScreen, despillOperation->getInputSocket(1));
 
 	graph->addOperation(despillOperation);
 
@@ -213,7 +213,9 @@
 
 	/* despill output image */
 	if (keying_data->despill_factor > 0.0f) {
-		postprocessedImage = setupDespill(graph, postprocessedImage, inputScreen, keying_data->despill_factor);
+		postprocessedImage = setupDespill(graph, postprocessedImage,
+		                                  keyingOperation->getInputSocket(0)->getConnection()->getFromSocket(),
+		                                  keying_data->despill_factor);
 	}
 
 	/* connect result to output sockets */

Modified: branches/soc-2011-tomato/source/blender/compositor/nodes/COM_KeyingNode.h
===================================================================
--- branches/soc-2011-tomato/source/blender/compositor/nodes/COM_KeyingNode.h	2012-06-12 14:59:36 UTC (rev 47787)
+++ branches/soc-2011-tomato/source/blender/compositor/nodes/COM_KeyingNode.h	2012-06-12 16:57:11 UTC (rev 47788)
@@ -32,7 +32,7 @@
 	OutputSocket *setupPreBlur(ExecutionSystem *graph, InputSocket *inputImage, int size, OutputSocket **originalImage);
 	OutputSocket *setupPostBlur(ExecutionSystem *graph, OutputSocket *postBLurInput, int size);
 	OutputSocket *setupDilateErode(ExecutionSystem *graph, OutputSocket *dilateErodeInput, int distance);
-	OutputSocket *setupDespill(ExecutionSystem *graph, OutputSocket *despillInput, InputSocket *inputSrceen, float factor);
+	OutputSocket *setupDespill(ExecutionSystem *graph, OutputSocket *despillInput, OutputSocket *inputSrceen, float factor);
 	OutputSocket *setupClip(ExecutionSystem *graph, OutputSocket *clipInput, int kernelRadius, float kernelTolerance,
 	                        float clipBlack, float clipWhite, bool edgeMatte);
 public: