[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28229] branches/render25/source/blender/ editors/space_node/node_edit.c: Render Branch: Fix merge full sample not working after cancelling render,

[Brecht Van Lommel]

Revision: 28229
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28229
Author:   blendix
Date:     2010-04-16 13:19:17 +0200 (Fri, 16 Apr 2010)

Log Message:
-----------
Render Branch: Fix merge full sample not working after cancelling render,
proper fix would be to get rid of G.afbreek entirely..

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

Modified: branches/render25/source/blender/editors/space_node/node_edit.c
===================================================================
--- branches/render25/source/blender/editors/space_node/node_edit.c	2010-04-16 10:47:49 UTC (rev 28228)
+++ branches/render25/source/blender/editors/space_node/node_edit.c	2010-04-16 11:19:17 UTC (rev 28229)
@@ -1769,6 +1769,7 @@
 
 //	WM_cursor_wait(1);
 
+	G.afbreek= 0;
 	RE_MergeFullSample(re, curscene, snode->nodetree);
 	snode_notify(C, snode);