sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix [#31819] New Compositor Ommits 'Composite' layer

Browse Source 
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.
This commit is contained in:
Campbell Barton 2012-06-13 19:43:09 +00:00
parent b006ed7d65
commit 96099688c6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/compositor/operations/COM_CompositorOperation.cpp
View 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) {