fix [#31819] New Compositor Ommits 'Composite' layer
authorCampbell Barton <ideasman42@gmail.com>
Wed, 13 Jun 2012 19:43:09 +0000 (19:43 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 13 Jun 2012 19:43:09 +0000 (19:43 +0000)
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.

source/blender/compositor/operations/COM_CompositorOperation.cpp

index 11cb4f7fc74c8287c79d7bdef9f2837f947b5ed5..2b1a804b4321fbf30e0734955b42afbfa140090c 100644 (file)
@@ -59,7 +59,7 @@ void CompositorOperation::initExecution()
 
 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 @@ void CompositorOperation::deinitExecution()
                                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) {