[Bf-blender-cvs] [565df15] master: T43771: Fix

[Jeroen Bakker]

Commit: 565df1559f8bb09381a2e5ed57f0d0a658f62580
Author: Jeroen Bakker
Date:   Tue Feb 24 20:28:12 2015 +0100
Branches: master
https://developer.blender.org/rB565df1559f8bb09381a2e5ed57f0d0a658f62580

T43771: Fix

There is a difference between the socket order of the BokehBlur node and
the BokehBlur operation. Socket[2] and Socket[3] have switched their
order.

===================================================================

M	source/blender/compositor/nodes/COM_BokehBlurNode.cpp

===================================================================

diff --git a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
index 636660b..7ab05e4 100644
--- a/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
+++ b/source/blender/compositor/nodes/COM_BokehBlurNode.cpp
@@ -62,8 +62,13 @@ void BokehBlurNode::convertToOperations(NodeConverter &converter, const Composit
 		converter.addOperation(operation);
 		converter.mapInputSocket(getInputSocket(0), operation->getInputSocket(0));
 		converter.mapInputSocket(getInputSocket(1), operation->getInputSocket(1));
-		converter.mapInputSocket(getInputSocket(2), operation->getInputSocket(2));
-		converter.mapInputSocket(getInputSocket(3), operation->getInputSocket(3));
+
+		// NOTE: on the bokeh blur operation the sockets are switched.
+		// for this reason the next two lines are correct.
+		// Fix for T43771
+		converter.mapInputSocket(getInputSocket(2), operation->getInputSocket(3));
+		converter.mapInputSocket(getInputSocket(3), operation->getInputSocket(2));
+
 		converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket());
 
 		if (!connectedSizeSocket) {