From 6a132aa65d45658262a634620e756b3fd6c2ddb6 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Mon, 6 Jul 2015 11:13:49 -0300 Subject: 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 --- source/blender/render/intern/source/pipeline.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source/blender/render') diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 31efdb95ac1..796dfd1094b 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; -- cgit v1.2.3