[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54370] trunk/blender/source/blender/ compositor/nodes/COM_SetAlphaNode.cpp: fix for [#34133] Creation of an RGBA buffer from an RGB color and an alpha channel not possible .

[Jeroen Bakker]

Revision: 54370
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54370
Author:   jbakker
Date:     2013-02-07 07:24:22 +0000 (Thu, 07 Feb 2013)
Log Message:
-----------
fix for [#34133] Creation of an RGBA buffer from an RGB color and an alpha channel not possible.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/nodes/COM_SetAlphaNode.cpp

Modified: trunk/blender/source/blender/compositor/nodes/COM_SetAlphaNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_SetAlphaNode.cpp	2013-02-07 07:24:02 UTC (rev 54369)
+++ trunk/blender/source/blender/compositor/nodes/COM_SetAlphaNode.cpp	2013-02-07 07:24:22 UTC (rev 54370)
@@ -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());