[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40013] trunk/blender/source/blender/ editors/space_node/node_edit.c: Updating render layer and image output sockets was not working due to changes in snode_set_context .

[Lukas Toenne]

Revision: 40013
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40013
Author:   lukastoenne
Date:     2011-09-07 13:30:16 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
Updating render layer and image output sockets was not working due to changes in snode_set_context. Before the r39941 this used a hack to 'test for first drawing', but since the snode->nodetree was set to NULL each time at the start of that function the condition would always evaluate true anyway. Simply removed that check to restore previous behavior.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39941

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/node_edit.c

Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c	2011-09-07 12:47:23 UTC (rev 40012)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c	2011-09-07 13:30:16 UTC (rev 40013)
@@ -447,9 +447,8 @@
 	else if(snode->treetype==NTREE_COMPOSIT) {
 		snode->id= &scene->id;
 		
-		/* bit clumsy but reliable way to see if we draw first time */
-		if(snode->nodetree==NULL)
-			ntreeCompositForceHidden(scene->nodetree, scene);
+		/* update output sockets based on available layers */
+		ntreeCompositForceHidden(scene->nodetree, scene);
 	}
 	else if(snode->treetype==NTREE_TEXTURE) {
 		Tex *tx= NULL;