diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-10-23 15:58:00 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-10-23 15:58:00 +0400 |
| commit | 268e519b412583da01306c5f9c309fa6327e0e90 (patch) | |
| tree | 09f9843846a0bcb3a2cb375b99d422cff012ebd9 /source/blender/compositor | |
| parent | 89fc09b3be854cb4228b681c8094bf0fbbce6eb5 (diff) | |
Fix #37175, Viewer node issue for newly toggled render passes.
The RenderLayers node would use the "combined" image result for all passes which don't have a valid render result yet. This causes problems when the buffer element size is not actually 4 floats (RGBA) as
with the 3 float normal passes. Also the result is rather meaningless then, so just keep the image buffer at NULL for unavailable passes, which will return plain (0,0,0) color.
Diffstat (limited to 'source/blender/compositor')
| -rw-r--r-- | source/blender/compositor/operations/COM_RenderLayersProg.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/compositor/operations/COM_RenderLayersProg.cpp b/source/blender/compositor/operations/COM_RenderLayersProg.cpp index ea6ad86d92c..a8382dd1746 100644 --- a/source/blender/compositor/operations/COM_RenderLayersProg.cpp +++ b/source/blender/compositor/operations/COM_RenderLayersProg.cpp @@ -60,7 +60,7 @@ void RenderLayersBaseProg::initExecution() if (rl && rl->rectf) { this->m_inputBuffer = RE_RenderLayerGetPass(rl, this->m_renderpass); - if (this->m_inputBuffer == NULL || this->m_renderpass == SCE_PASS_COMBINED) { + if (this->m_inputBuffer == NULL && this->m_renderpass == SCE_PASS_COMBINED) { this->m_inputBuffer = rl->rectf; } } |