diff options
| author | Ton Roosendaal <ton@blender.org> | 2013-01-24 23:31:44 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2013-01-24 23:31:44 +0400 |
| commit | ca7b277c120e4622c816b8a6d922d64ccf050bd0 (patch) | |
| tree | f3007665f14fa0a6311e4a89fc974b286296468c /source | |
| parent | a97757c156e500e3e3593c8b82cfe2bb2ce27c45 (diff) | |
Disabled commit that was rendering Blender Internal for Cycles nodes.
Apparently Material nodes allow a mix of Cycles and BI Materials. Nifty!
I should read more docs, like this cool tutorial:
http://urchn.org/post/combining-blender-internal-and-cycles-in-one-render
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_node/node_draw.c | 13 | ||||
| -rw-r--r-- | source/blender/nodes/intern/node_exec.c | 4 |
2 files changed, 2 insertions, 15 deletions
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 6477d39e19b..d5d2ace6fa7 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -702,19 +702,6 @@ static void node_draw_basis(const bContext *C, ARegion *ar, SpaceNode *snode, bN if (node->flag & NODE_MUTED) UI_ThemeColorBlend(color_id, TH_REDALERT, 0.5f); - /* debug info: using wrong shaders in wrong context */ - if (ntree->type == NTREE_SHADER) { - if (snode->flag & SNODE_NEW_SHADERS) { - if (node->typeinfo->compatibility == NODE_OLD_SHADING) - UI_ThemeColor(TH_REDALERT); - } - else { - if (node->typeinfo->compatibility == NODE_NEW_SHADING) - UI_ThemeColor(TH_REDALERT); - } - } - - #ifdef WITH_COMPOSITOR if (ntree->type == NTREE_COMPOSIT && (snode->flag & SNODE_SHOW_HIGHLIGHT)) { diff --git a/source/blender/nodes/intern/node_exec.c b/source/blender/nodes/intern/node_exec.c index 39ba11ec07d..579d46f45eb 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_NEW_SHADING) - return 0; +// 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) |