Commit: 2419002e3445bd17df5fc1d8fc98fdbcade4d930
Author: Lukas Tönne
Date: Wed Sep 24 14:27:36 2014 +0200
Branches: blender-v2.72-release
https://developer.blender.org/rB2419002e3445bd17df5fc1d8fc98fdbcade4d930
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);
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
