diff options
| author | Ton Roosendaal <ton@blender.org> | 2013-01-24 22:56:04 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2013-01-24 22:56:04 +0400 |
| commit | a97757c156e500e3e3593c8b82cfe2bb2ce27c45 (patch) | |
| tree | 7686f3ed17cd9df07c1a3cc125d1326379d61f12 /source | |
| parent | 4477d59b76a0785f24cce263a3496c27ad002532 (diff) | |
Logic mistake in previous commit, broke node materials for Internal render.
Stupid!
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/nodes/intern/node_exec.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/nodes/intern/node_exec.c b/source/blender/nodes/intern/node_exec.c index 061ec71d1e2..39ba11ec07d 100644 --- a/source/blender/nodes/intern/node_exec.c +++ b/source/blender/nodes/intern/node_exec.c @@ -305,8 +305,8 @@ int ntreeExecThreadNodes(bNodeTreeExec *exec, bNodeThreadStack *nts, void *calle * If the mute func is not set, assume the node should never be muted, * and hence execute it! */ - if (node->typeinfo->compatibility != NODE_OLD_SHADING) - break; + if (node->typeinfo->compatibility == NODE_NEW_SHADING) + return 0; if (node->typeinfo->execfunc) node->typeinfo->execfunc(callerdata, node, nsin, nsout); else if (node->typeinfo->newexecfunc) @@ -314,8 +314,6 @@ int ntreeExecThreadNodes(bNodeTreeExec *exec, bNodeThreadStack *nts, void *calle } } - /* signal to switch back to no-node render */ - if (node) - return 0; + /* signal to that all went OK, for render */ return 1; } |