[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40453] trunk/blender/source/blender/ editors/space_node: Fix #28585: read full sample layers not working in compositor.

[Brecht Van Lommel]

Revision: 40453
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40453
Author:   blendix
Date:     2011-09-22 12:45:25 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
Fix #28585: read full sample layers not working in compositor.

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

Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c	2011-09-22 12:31:01 UTC (rev 40452)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c	2011-09-22 12:45:25 UTC (rev 40453)
@@ -2903,12 +2903,13 @@
 	Render *re= RE_NewRender(curscene->id.name);
 
 	WM_cursor_wait(1);
-
 	RE_MergeFullSample(re, bmain, curscene, snode->nodetree);
-	snode_notify(C, snode);
-	snode_dag_update(C, snode);
-	
 	WM_cursor_wait(0);
+
+	/* note we are careful to send the right notifier, as otherwise the
+	   compositor would reexecute and overwrite the full sample result */
+	WM_event_add_notifier(C, NC_SCENE|ND_COMPO_RESULT, NULL);
+
 	return OPERATOR_FINISHED;
 }
 

Modified: trunk/blender/source/blender/editors/space_node/space_node.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/space_node.c	2011-09-22 12:31:01 UTC (rev 40452)
+++ trunk/blender/source/blender/editors/space_node/space_node.c	2011-09-22 12:45:25 UTC (rev 40453)
@@ -178,6 +178,9 @@
 				case ND_FRAME:
 					ED_area_tag_refresh(sa);
 					break;
+				case ND_COMPO_RESULT:
+					ED_area_tag_redraw(sa);
+					break;
 				case ND_TRANSFORM_DONE:
 					if(type==NTREE_COMPOSIT) {
 						if(snode->flag & SNODE_AUTO_RENDER) {