[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47849] trunk/blender/source/blender/ compositor/operations/COM_CompositorOperation.cpp: fix [#31819] New Compositor Ommits 'Composite' layer

[Campbell Barton]

Revision: 47849
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47849
Author:   campbellbarton
Date:     2012-06-13 19:43:09 +0000 (Wed, 13 Jun 2012)
Log Message:
-----------
fix [#31819] New Compositor Ommits 'Composite' layer

the bug was introduced by accident in r47826, finishing a render node acted as if escape was pressed.

also changed order of signaling and releasing the buffer to match the old compositor.

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

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/operations/COM_CompositorOperation.cpp

Modified: trunk/blender/source/blender/compositor/operations/COM_CompositorOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_CompositorOperation.cpp	2012-06-13 19:10:52 UTC (rev 47848)
+++ trunk/blender/source/blender/compositor/operations/COM_CompositorOperation.cpp	2012-06-13 19:43:09 UTC (rev 47849)
@@ -59,7 +59,7 @@
 
 void CompositorOperation::deinitExecution()
 {
-	if (isBreaked()) {
+	if (!isBreaked()) {
 		const Scene *scene = this->scene;
 		Render *re = RE_GetRender(scene->id.name);
 		RenderResult *rr = RE_AcquireResultWrite(re);
@@ -74,11 +74,13 @@
 				MEM_freeN(this->outputBuffer);
 			}
 		}
+
+		BKE_image_signal(BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result"), NULL, IMA_SIGNAL_FREE);
+
 		if (re) {
 			RE_ReleaseResult(re);
 			re = NULL;
 		}
-		BKE_image_signal(BKE_image_verify_viewer(IMA_TYPE_R_RESULT, "Render Result"), NULL, IMA_SIGNAL_FREE);
 	}
 	else {
 		if (this->outputBuffer) {