diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-13 23:43:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-13 23:43:09 +0400 |
| commit | 96099688c667dd601d6dc7c795dd508f5d28646c (patch) | |
| tree | c85dacf0a9be490b60f70ae92c24bf401125c813 /source/blender/compositor/operations/COM_CompositorOperation.cpp | |
| parent | b006ed7d6586a4a53199b72463b1080903501e71 (diff) | |
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.
Diffstat (limited to 'source/blender/compositor/operations/COM_CompositorOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_CompositorOperation.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cpp b/source/blender/compositor/operations/COM_CompositorOperation.cpp index 11cb4f7fc74..2b1a804b432 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.cpp +++ b/source/blender/compositor/operations/COM_CompositorOperation.cpp @@ -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) { |