[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54086] trunk/blender/source/blender: Disabled commit that was rendering Blender Internal for Cycles nodes.

[Ton Roosendaal]

Revision: 54086
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54086
Author:   ton
Date:     2013-01-24 19:31:44 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------
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

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/node_draw.c
    trunk/blender/source/blender/nodes/intern/node_exec.c

Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c	2013-01-24 18:56:04 UTC (rev 54085)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c	2013-01-24 19:31:44 UTC (rev 54086)
@@ -702,20 +702,7 @@
 	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)) {
 		if (COM_isHighlightedbNode(node)) {

Modified: trunk/blender/source/blender/nodes/intern/node_exec.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/node_exec.c	2013-01-24 18:56:04 UTC (rev 54085)
+++ trunk/blender/source/blender/nodes/intern/node_exec.c	2013-01-24 19:31:44 UTC (rev 54086)
@@ -305,8 +305,8 @@
 			 * 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)