griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Logic mistake in previous commit, broke node materials for Internal render.

Browse Source 
Stupid!
This commit is contained in:
Ton Roosendaal
2013-01-24 18:56:04 +00:00
parent 4477d59b76
commit a97757c156
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/nodes/intern/node_exec.c
View File

@@ -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;
}