[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55284] trunk/blender/source/blender/ compositor: There was a regression in recent bugfix which touched Mix node.

[Sergey Sharybin]

Revision: 55284
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55284
Author:   nazgul
Date:     2013-03-14 16:25:32 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
There was a regression in recent bugfix which touched Mix node.

This commit hopefully fixes that regression.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/nodes/COM_MixNode.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixBaseOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_MixBaseOperation.h

Modified: trunk/blender/source/blender/compositor/nodes/COM_MixNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_MixNode.cpp	2013-03-14 15:01:23 UTC (rev 55283)
+++ trunk/blender/source/blender/compositor/nodes/COM_MixNode.cpp	2013-03-14 16:25:32 UTC (rev 55284)
@@ -124,6 +124,16 @@
 	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);

Modified: trunk/blender/source/blender/compositor/operations/COM_MixBaseOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_MixBaseOperation.cpp	2013-03-14 15:01:23 UTC (rev 55283)
+++ trunk/blender/source/blender/compositor/operations/COM_MixBaseOperation.cpp	2013-03-14 16:25:32 UTC (rev 55284)
@@ -69,19 +69,3 @@
 	this->m_inputColor1Operation = NULL;
 	this->m_inputColor2Operation = NULL;
 }
-
-void MixBaseOperation::determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2])
-{
-	if (this->getInputSocket(1)->isConnected()) {
-		this->setResolutionInputSocketIndex(1);
-	}
-	else {
-		if (this->getInputSocket(2)->isConnected()) {
-			this->setResolutionInputSocketIndex(2);
-		}
-		else {
-			this->setResolutionInputSocketIndex(0);
-		}
-	}
-	NodeOperation::determineResolution(resolution, preferredResolution);
-}

Modified: trunk/blender/source/blender/compositor/operations/COM_MixBaseOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_MixBaseOperation.h	2013-03-14 15:01:23 UTC (rev 55283)
+++ trunk/blender/source/blender/compositor/operations/COM_MixBaseOperation.h	2013-03-14 16:25:32 UTC (rev 55284)
@@ -71,8 +71,6 @@
 	 */
 	void deinitExecution();
 	
-	void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
-	
 	void setUseValueAlphaMultiply(const bool value) { this->m_valueAlphaMultiply = value; }
 	bool useValueAlphaMultiply() { return this->m_valueAlphaMultiply; }
 	void setUseClamp(bool value) { this->m_useClamp = value; }