[Bf-blender-cvs] [488581b] master: Fix T39830: Viewer node update error in the compositor when using the seperate/combine YCbCr nodes

Sergey Sharybin noreply at git.blender.org
Thu Apr 24 11:18:35 CEST 2014


Commit: 488581bfc6cef42a966e6e37b010a4338c812f8b
Author: Sergey Sharybin
Date:   Thu Apr 24 15:17:14 2014 +0600
https://developer.blender.org/rB488581bfc6cef42a966e6e37b010a4338c812f8b

Fix T39830: Viewer node update error in the compositor when using the seperate/combine YCbCr nodes

Mode of the YCC<->RGB was never set..

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

M	source/blender/compositor/nodes/COM_CombineColorNode.cpp
M	source/blender/compositor/nodes/COM_SeparateColorNode.cpp

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

diff --git a/source/blender/compositor/nodes/COM_CombineColorNode.cpp b/source/blender/compositor/nodes/COM_CombineColorNode.cpp
index 2c1a333..c7a3baf 100644
--- a/source/blender/compositor/nodes/COM_CombineColorNode.cpp
+++ b/source/blender/compositor/nodes/COM_CombineColorNode.cpp
@@ -84,7 +84,10 @@ NodeOperation *CombineHSVANode::getColorConverter(const CompositorContext &conte
 
 NodeOperation *CombineYCCANode::getColorConverter(const CompositorContext &context) const
 {
-	return new ConvertYCCToRGBOperation();
+	ConvertYCCToRGBOperation *operation = new ConvertYCCToRGBOperation();
+	bNode *editorNode = this->getbNode();
+	operation->setMode(editorNode->custom1);
+	return operation;
 }
 
 NodeOperation *CombineYUVANode::getColorConverter(const CompositorContext &context) const
diff --git a/source/blender/compositor/nodes/COM_SeparateColorNode.cpp b/source/blender/compositor/nodes/COM_SeparateColorNode.cpp
index fba8744..a6fa906 100644
--- a/source/blender/compositor/nodes/COM_SeparateColorNode.cpp
+++ b/source/blender/compositor/nodes/COM_SeparateColorNode.cpp
@@ -108,7 +108,10 @@ NodeOperation *SeparateHSVANode::getColorConverter(const CompositorContext &cont
 
 NodeOperation *SeparateYCCANode::getColorConverter(const CompositorContext &context) const
 {
-	return new ConvertRGBToYCCOperation();
+	ConvertRGBToYCCOperation *operation = new ConvertRGBToYCCOperation();
+	bNode *editorNode = this->getbNode();
+	operation->setMode(editorNode->custom1);
+	return operation;
 }
 
 NodeOperation *SeparateYUVANode::getColorConverter(const CompositorContext &context) const




More information about the Bf-blender-cvs mailing list