[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33923] trunk/blender/source/blender: Bugreport, IRC

[Ton Roosendaal]

Revision: 33923
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33923
Author:   ton
Date:     2010-12-28 11:39:27 +0100 (Tue, 28 Dec 2010)

Log Message:
-----------
Bugreport, IRC

Compositor: "Read & Compo Full Sample Buffers" option stopped after
1 pass; the break callback was returning '1' falsely.

Also made it show "wait cursor" again, since it doesn't run in 
thread nor updates UI while compositing buffers. Check console for
progress for now.

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

Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c	2010-12-28 09:14:56 UTC (rev 33922)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c	2010-12-28 10:39:27 UTC (rev 33923)
@@ -1935,12 +1935,12 @@
 	Scene *curscene= CTX_data_scene(C);
 	Render *re= RE_NewRender(curscene->id.name);
 
-//	WM_cursor_wait(1);
+	WM_cursor_wait(1);
 
 	RE_MergeFullSample(re, bmain, curscene, snode->nodetree);
 	snode_notify(C, snode);
 	
-//	WM_cursor_wait(0);
+	WM_cursor_wait(0);
 	return OPERATOR_FINISHED;
 }
 

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2010-12-28 09:14:56 UTC (rev 33922)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2010-12-28 10:39:27 UTC (rev 33923)
@@ -2338,11 +2338,15 @@
 	BLI_rw_mutex_unlock(&re->resultmutex);
 }
 
+/* called externally, via compositor */
 void RE_MergeFullSample(Render *re, Main *bmain, Scene *sce, bNodeTree *ntree)
 {
 	Scene *scene;
 	bNode *node;
 
+	/* default start situation */
+	G.afbreek= 0;
+	
 	re->main= bmain;
 	
 	/* first call RE_ReadRenderResult on every renderlayer scene. this creates Render structs */