[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54085] trunk/blender/source/blender/nodes /intern/node_exec.c: Logic mistake in previous commit, broke node materials for Internal render.

[Ton Roosendaal]

Revision: 54085
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54085
Author:   ton
Date:     2013-01-24 18:56:04 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------
Logic mistake in previous commit, broke node materials for Internal render.
Stupid!

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

Modified: trunk/blender/source/blender/nodes/intern/node_exec.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/node_exec.c	2013-01-24 17:57:38 UTC (rev 54084)
+++ trunk/blender/source/blender/nodes/intern/node_exec.c	2013-01-24 18:56:04 UTC (rev 54085)
@@ -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_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 @@
 		}
 	}
 	
-	/* signal to switch back to no-node render */
-	if (node)
-		return 0;
+	/* signal to that all went OK, for render */
 	return 1;
 }