[Bf-blender-cvs] [489a5d3] master: Fix T45959: DistanceKey output incorrect

[Campbell Barton]

Commit: 489a5d34b7bf84141696e99274a4cbd7425a9b7b
Author: Campbell Barton
Date:   Mon Aug 31 16:20:21 2015 +1000
Branches: master
https://developer.blender.org/rB489a5d34b7bf84141696e99274a4cbd7425a9b7b

Fix T45959: DistanceKey output incorrect

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

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

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

diff --git a/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp b/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
index 4f3ab60..c617ecb 100644
--- a/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_DistanceMatteNode.cpp
@@ -81,10 +81,20 @@ void DistanceMatteNode::convertToOperations(NodeConverter &converter, const Comp
 		operation = matte;
 	}
 	
+	converter.mapOutputSocket(outputSocketMatte, operation->getOutputSocket(0));
 	converter.addLink(operation->getOutputSocket(), operationAlpha->getInputSocket(1));
 	
-	converter.mapOutputSocket(outputSocketMatte, operation->getOutputSocket());
-	converter.mapOutputSocket(outputSocketImage, operationAlpha->getOutputSocket());
+	if (storage->channel != 1) {
+		ConvertYCCToRGBOperation *inv_convert = new ConvertYCCToRGBOperation();
+		inv_convert->setMode(0); /* BLI_YCC_ITU_BT601 */
+
+		converter.addOperation(inv_convert);
+		converter.addLink(operationAlpha->getOutputSocket(0), inv_convert->getInputSocket(0));
+		converter.mapOutputSocket(outputSocketImage, inv_convert->getOutputSocket());
+	}
+	else {
+		converter.mapOutputSocket(outputSocketImage, operationAlpha->getOutputSocket());
+	}
 	
 	converter.addPreview(operationAlpha->getOutputSocket());
 }