diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-06 21:11:18 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-06 21:11:18 +0300 |
| commit | 3733c52985878b8d3ae5911f415ab9328966d48f (patch) | |
| tree | 4e4c665f808dd106bf54c2fa006ec00ba067f532 /source/blender/compositor | |
| parent | 90ea5c543aa7e091ae21aac6b8d87c97c3aa0464 (diff) | |
| parent | a5bb40170417acede168291eb81e3076a6cee077 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/compositor')
| -rw-r--r-- | source/blender/compositor/operations/COM_CompositorOperation.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cpp b/source/blender/compositor/operations/COM_CompositorOperation.cpp index 16e33c908d6..24846f738dd 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.cpp +++ b/source/blender/compositor/operations/COM_CompositorOperation.cpp @@ -94,6 +94,7 @@ void CompositorOperation::deinitExecution() MEM_freeN(rv->rectz); } rv->rectz = this->m_depthBuffer; + rr->have_combined = true; } else { if (this->m_outputBuffer) { |