[Bf-blender-cvs] [345b166] master: Fix T41885, muting broken for Blender Internal nodes in rendering.

Lukas Tönne noreply at git.blender.org
Wed Sep 24 14:29:15 CEST 2014


Commit: 345b16601cfb8e50ca03f883902ee070c1630c2f
Author: Lukas Tönne
Date:   Wed Sep 24 14:27:36 2014 +0200
Branches: master
https://developer.blender.org/rB345b16601cfb8e50ca03f883902ee070c1630c2f

Fix T41885, muting broken for Blender Internal nodes in rendering.

Nodes don't have muting callbacks any more, so now have to check the
flag to prevent overwriting values on the stack that they share with
inputs.

===================================================================

M	source/blender/nodes/intern/node_exec.c

===================================================================

diff --git a/source/blender/nodes/intern/node_exec.c b/source/blender/nodes/intern/node_exec.c
index 9529e08..2347564 100644
--- a/source/blender/nodes/intern/node_exec.c
+++ b/source/blender/nodes/intern/node_exec.c
@@ -305,7 +305,7 @@ bool ntreeExecThreadNodes(bNodeTreeExec *exec, bNodeThreadStack *nts, void *call
 			 */
 //			if (node->typeinfo->compatibility == NODE_NEW_SHADING)
 //				return false;
-			if (node->typeinfo->execfunc)
+			if (node->typeinfo->execfunc && !(node->flag & NODE_MUTED))
 				node->typeinfo->execfunc(callerdata, thread, node, &nodeexec->data, nsin, nsout);
 		}
 	}




More information about the Bf-blender-cvs mailing list