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:
authorJeroen Bakker <j.bakker@atmind.nl>2013-06-30 17:35:00 +0400
committerJeroen Bakker <j.bakker@atmind.nl>2013-06-30 17:35:00 +0400
commitd492a9ffa93f2fcffeae2b6f883d8835c0eeec8a (patch)
tree78037c9c3a4a1fb3adabe77b1e77d1777b866d68 /source/blender/compositor/nodes
parent5ae37494f63fd68e647028525ab0906c2ddce0ba (diff)
Fix for
* [#35922] RGB Input Node doesn't work properly
Diffstat (limited to 'source/blender/compositor/nodes')
-rw-r--r--source/blender/compositor/nodes/COM_MixNode.cpp10
1 files changed, 0 insertions, 10 deletions
diff --git a/source/blender/compositor/nodes/COM_MixNode.cpp b/source/blender/compositor/nodes/COM_MixNode.cpp
index 3e8f1fb0f74..ab4e464327d 100644
--- a/source/blender/compositor/nodes/COM_MixNode.cpp
+++ b/source/blender/compositor/nodes/COM_MixNode.cpp
@@ -124,16 +124,6 @@ void MixNode::convertToOperations(ExecutionSystem *graph, CompositorContext *con
convertProg->setUseValueAlphaMultiply(useAlphaPremultiply);
convertProg->setUseClamp(useClamp);
- if (color1Socket->isConnected()) {
- convertProg->setResolutionInputSocketIndex(1);
- }
- else {
- if (color2Socket->isConnected())
- convertProg->setResolutionInputSocketIndex(2);
- else
- convertProg->setResolutionInputSocketIndex(0);
- }
-
valueSocket->relinkConnections(convertProg->getInputSocket(0), 0, graph);
color1Socket->relinkConnections(convertProg->getInputSocket(1), 1, graph);
color2Socket->relinkConnections(convertProg->getInputSocket(2), 2, graph);