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-02-07 11:24:22 +0400
committerJeroen Bakker <j.bakker@atmind.nl>2013-02-07 11:24:22 +0400
commit67da51fe768d3a336fe3ac90b813f548f566f390 (patch)
tree378248f43b374232da04378d6afc86bb5bbe7cf8 /source/blender/compositor/nodes/COM_SetAlphaNode.cpp
parentd648e036199ebb95fdc88945fe15144db302c121 (diff)
fix for [#34133] Creation of an RGBA buffer from an RGB color and an alpha channel not possible.
Diffstat (limited to 'source/blender/compositor/nodes/COM_SetAlphaNode.cpp')
-rw-r--r--source/blender/compositor/nodes/COM_SetAlphaNode.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/compositor/nodes/COM_SetAlphaNode.cpp b/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
index 709dc75b502..dd3ff5fbaa7 100644
--- a/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
+++ b/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
@@ -27,7 +27,11 @@
void SetAlphaNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
{
SetAlphaOperation *operation = new SetAlphaOperation();
-
+
+ if (!this->getInputSocket(0)->isConnected() && this->getInputSocket(1)->isConnected()) {
+ operation->setResolutionInputSocketIndex(1);
+ }
+
this->getInputSocket(0)->relinkConnections(operation->getInputSocket(0), 0, graph);
this->getInputSocket(1)->relinkConnections(operation->getInputSocket(1), 1, graph);
this->getOutputSocket(0)->relinkConnections(operation->getOutputSocket());