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

Disabled commit that was rendering Blender Internal for Cycles nodes.

Browse Source 
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
This commit is contained in:
Ton Roosendaal
2013-01-24 19:31:44 +00:00
parent a97757c156
commit ca7b277c12
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/editors/space_node/node_draw.c
View File

@@ -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)) {

4
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_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)