[Bf-blender-cvs] [6a132aa] master: Fix T45290: Selecting passes in image editor does no longer work

Dalai Felinto noreply at git.blender.org
Mon Jul 6 16:15:59 CEST 2015


Commit: 6a132aa65d45658262a634620e756b3fd6c2ddb6
Author: Dalai Felinto
Date:   Mon Jul 6 11:13:49 2015 -0300
Branches: master
https://developer.blender.org/rB6a132aa65d45658262a634620e756b3fd6c2ddb6

Fix T45290: Selecting passes in image editor does no longer work

This issue was introduced with the wrong fix I committed for dither (rB56ca7f34)
Which also means T45237 has to be re-open

===================================================================

M	source/blender/render/intern/source/pipeline.c

===================================================================

diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 31efdb9..796dfd1 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -338,8 +338,6 @@ void RE_AcquireResultImageViews(Render *re, RenderResult *rr)
 
 			rv = rr->views.first;
 
-			rr->have_combined = (rv->rectf != NULL);
-
 			/* active layer */
 			rl = render_get_active_layer(re, re->result);
 
@@ -357,6 +355,7 @@ void RE_AcquireResultImageViews(Render *re, RenderResult *rr)
 				}
 			}
 
+			rr->have_combined = (rv->rectf != NULL);
 			rr->layers = re->result->layers;
 			rr->xof = re->disprect.xmin;
 			rr->yof = re->disprect.ymin;
@@ -411,7 +410,7 @@ void RE_AcquireResultImage(Render *re, RenderResult *rr, const int view_id)
 					rr->rectz = RE_RenderLayerGetPass(rl, SCE_PASS_Z, rv->name);
 			}
 
-			rr->have_combined = (rr->rectf != NULL);
+			rr->have_combined = (rv->rectf != NULL);
 			rr->layers = re->result->layers;
 			rr->views = re->result->views;




More information about the Bf-blender-cvs mailing list