From a97757c156e500e3e3593c8b82cfe2bb2ce27c45 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Thu, 24 Jan 2013 18:56:04 +0000 Subject: Logic mistake in previous commit, broke node materials for Internal render. Stupid! --- source/blender/nodes/intern/node_exec.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'source') 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; } -- cgit v1.2.3