diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-24 13:17:14 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-24 13:17:14 +0400 |
| commit | 488581bfc6cef42a966e6e37b010a4338c812f8b (patch) | |
| tree | 3c5574d70e3caf09664489be761ea68182243d58 /source | |
| parent | e7c5931990fe3ae4016352bbc2ea3d9a0186ab6d (diff) | |
Fix T39830: Viewer node update error in the compositor when using the seperate/combine YCbCr nodes
Mode of the YCC<->RGB was never set..
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/compositor/nodes/COM_CombineColorNode.cpp | 5 | ||||
| -rw-r--r-- | source/blender/compositor/nodes/COM_SeparateColorNode.cpp | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/compositor/nodes/COM_CombineColorNode.cpp b/source/blender/compositor/nodes/COM_CombineColorNode.cpp index 2c1a3337f89..c7a3baf809d 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 fba8744f58e..a6fa9065364 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 |