[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60907] trunk/blender/source/blender/ compositor/operations/COM_RenderLayersProg.cpp: Fix #37175, Viewer node issue for newly toggled render passes.

[Lukas Toenne]

Revision: 60907
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60907
Author:   lukastoenne
Date:     2013-10-23 11:58:00 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/operations/COM_RenderLayersProg.cpp

Modified: trunk/blender/source/blender/compositor/operations/COM_RenderLayersProg.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_RenderLayersProg.cpp	2013-10-23 11:30:18 UTC (rev 60906)
+++ trunk/blender/source/blender/compositor/operations/COM_RenderLayersProg.cpp	2013-10-23 11:58:00 UTC (rev 60907)
@@ -60,7 +60,7 @@
 			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;
 				}
 			}