[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51494] trunk/blender/intern/cycles/render /nodes.cpp: Fix #32947: cycles color to float conversion issue after integer socket commit.

Brecht Van Lommel brechtvanlommel at pandora.be
Mon Oct 22 14:22:16 CEST 2012


Revision: 51494
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51494
Author:   blendix
Date:     2012-10-22 12:22:15 +0000 (Mon, 22 Oct 2012)
Log Message:
-----------
Fix #32947: cycles color to float conversion issue after integer socket commit.

Modified Paths:
--------------
    trunk/blender/intern/cycles/render/nodes.cpp

Modified: trunk/blender/intern/cycles/render/nodes.cpp
===================================================================
--- trunk/blender/intern/cycles/render/nodes.cpp	2012-10-22 08:15:51 UTC (rev 51493)
+++ trunk/blender/intern/cycles/render/nodes.cpp	2012-10-22 12:22:15 UTC (rev 51494)
@@ -1124,6 +1124,9 @@
 			compiler.add_node(NODE_CONVERT, NODE_CONVERT_IV, in->stack_offset, out->stack_offset);
 	}
 	else if(to == SHADER_SOCKET_FLOAT) {
+		compiler.stack_assign(in);
+		compiler.stack_assign(out);
+
 		if(from == SHADER_SOCKET_COLOR)
 			/* color to float */
 			compiler.add_node(NODE_CONVERT, NODE_CONVERT_CF, in->stack_offset, out->stack_offset);
@@ -1132,6 +1135,9 @@
 			compiler.add_node(NODE_CONVERT, NODE_CONVERT_VF, in->stack_offset, out->stack_offset);
 	}
 	else if(to == SHADER_SOCKET_INT) {
+		compiler.stack_assign(in);
+		compiler.stack_assign(out);
+
 		if(from == SHADER_SOCKET_COLOR)
 			/* color to int */
 			compiler.add_node(NODE_CONVERT, NODE_CONVERT_CI, in->stack_offset, out->stack_offset);




More information about the Bf-blender-cvs mailing list