[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32253] trunk/blender/source/blender/ blenkernel/intern/node.c: Most likely fix for #23420: viewer node: loses viewer nodes forever.

[Brecht Van Lommel]

Revision: 32253
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32253
Author:   blendix
Date:     2010-10-02 16:32:03 +0200 (Sat, 02 Oct 2010)

Log Message:
-----------
Most likely fix for #23420: viewer node: loses viewer nodes forever.

Related to another bug fixed recently, both viewer + split viewer
could be set to output to the same image. That also could make node
tree localization/sync go wrong.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/node.c

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c	2010-10-02 14:17:20 UTC (rev 32252)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2010-10-02 14:32:03 UTC (rev 32253)
@@ -1695,8 +1695,6 @@
 {
 	bNode *node;
 
-	printf("\n");
-
 	/* find the active outputs, might become tree type dependant handler */
 	for(node= ntree->nodes.first; node; node= node->next) {
 		if(node->typeinfo->nclass==NODE_CLASS_OUTPUT) {
@@ -1724,9 +1722,6 @@
 			}
 			if(output==0)
 				node->flag |= NODE_DO_OUTPUT;
-
-			if(node->flag & NODE_DO_OUTPUT)
-				printf("do output %s\n", node->name);
 		}
 	}
 	
@@ -2584,7 +2579,10 @@
 		
 	}
 	/* end animdata uglyness */
-	
+
+	/* ensures only a single output node is enabled */
+	ntreeSetOutput(ntree);
+
 	/* move over the compbufs */
 	/* right after ntreeCopyTree() oldsock pointers are valid */
 	for(node= ntree->nodes.first; node; node= node->next) {