diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-09-24 16:27:36 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-10-03 17:09:24 +0400 |
| commit | 2419002e3445bd17df5fc1d8fc98fdbcade4d930 (patch) | |
| tree | 94b7fb26ca89a0d60290360636f9c1455f384b42 /source/blender | |
| parent | ab4298bff68821185ab0cb42439f7c6d6d178c70 (diff) | |
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.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/nodes/intern/node_exec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/intern/node_exec.c b/source/blender/nodes/intern/node_exec.c index 9529e087b2e..2347564c696 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); } } |