[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58764] trunk/blender/source/blender/nodes /intern/node_exec.c: Fix #36267 part 2 of 2: Fix for reroute node values in old shader node stack system.

Lukas Toenne lukas.toenne at googlemail.com
Wed Jul 31 14:26:03 CEST 2013


Revision: 58764
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58764
Author:   lukastoenne
Date:     2013-07-31 12:26:03 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Fix #36267 part 2 of 2: Fix for reroute node values in old shader node stack system. They were overwriting stack values from their input nodes, because the system would not detect that these sockets
actually just point to existing defined stack values. To make the link check work, set the socket->link pointer if internal node connections exist, this works for both muted and reroute nodes.

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/intern/node_exec.c

Modified: trunk/blender/source/blender/nodes/intern/node_exec.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/node_exec.c	2013-07-31 12:26:01 UTC (rev 58763)
+++ trunk/blender/source/blender/nodes/intern/node_exec.c	2013-07-31 12:26:03 UTC (rev 58764)
@@ -98,6 +98,10 @@
 		for (link = internal_links->first; link; link = link->next) {
 			if (link->tosock == sock) {
 				sock->stack_index = link->fromsock->stack_index;
+				/* set the link pointer to indicate that this socket
+				 * should not overwrite the stack value!
+				 */
+				sock->link = link;
 				break;
 			}
 		}




More information about the Bf-blender-cvs mailing list