Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2018-01-08 11:39:32 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-01-08 11:39:32 +0300
commitc26da06ae67348f62b27af33b76f2d18e6c7c274 (patch)
tree599d76f3b8ce2dc08b20e5617d11854314d12da2 /source/blender/compositor/nodes
parent84d4476eb11cddcc88c8271c22bb8d1051421f0d (diff)
parent96e507d9890e42695ea0c6bff0c8fa5c480bbb5a (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/compositor/nodes')
-rw-r--r--source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp b/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
index 382296a7f3a..de6ad3df030 100644
--- a/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
+++ b/source/blender/compositor/nodes/COM_LuminanceMatteNode.cpp
@@ -37,14 +37,11 @@ void LuminanceMatteNode::convertToOperations(NodeConverter &converter, const Com
NodeOutput *outputSocketImage = this->getOutputSocket(0);
NodeOutput *outputSocketMatte = this->getOutputSocket(1);
- ConvertRGBToYUVOperation *rgbToYUV = new ConvertRGBToYUVOperation();
LuminanceMatteOperation *operationSet = new LuminanceMatteOperation();
operationSet->setSettings((NodeChroma *)editorsnode->storage);
- converter.addOperation(rgbToYUV);
converter.addOperation(operationSet);
- converter.mapInputSocket(inputSocket, rgbToYUV->getInputSocket(0));
- converter.addLink(rgbToYUV->getOutputSocket(), operationSet->getInputSocket(0));
+ converter.mapInputSocket(inputSocket, operationSet->getInputSocket(0));
converter.mapOutputSocket(outputSocketMatte, operationSet->getOutputSocket(0));
SetAlphaOperation *operation = new SetAlphaOperation();