[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59669] trunk/blender/source/blender/nodes /shader/node_shader_tree.c: Fix #36609: glsl materials with reroute nodes not working correct.

[Brecht Van Lommel]

Revision: 59669
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59669
Author:   blendix
Date:     2013-08-30 17:18:15 +0000 (Fri, 30 Aug 2013)
Log Message:
-----------
Fix #36609: glsl materials with reroute nodes not working correct.

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/shader/node_shader_tree.c

Modified: trunk/blender/source/blender/nodes/shader/node_shader_tree.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/node_shader_tree.c	2013-08-30 17:01:44 UTC (rev 59668)
+++ trunk/blender/source/blender/nodes/shader/node_shader_tree.c	2013-08-30 17:18:15 UTC (rev 59669)
@@ -189,13 +189,16 @@
 
 void ntreeGPUMaterialNodes(bNodeTree *ntree, GPUMaterial *mat)
 {
+	/* localize tree to create links for reroute and mute */
+	bNodeTree *localtree = ntreeLocalize(ntree);
 	bNodeTreeExec *exec;
 
-	exec = ntreeShaderBeginExecTree(ntree);
-
+	exec = ntreeShaderBeginExecTree(localtree);
 	ntreeExecGPUNodes(exec, mat, 1);
+	ntreeShaderEndExecTree(exec);
 
-	ntreeShaderEndExecTree(exec);
+	ntreeFreeTree_ex(localtree, false);
+	MEM_freeN(localtree);
 }
 
 /* **************** call to switch lamploop for material node ************ */