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
This commit is contained in:
Dalai Felinto 2015-07-06 11:13:49 -03:00 committed by Sergey Sharybin
parent 68282db6d5
commit c43e2daa59
Notes: blender-bot 2023-02-14 08:55:44 +01:00
Referenced by issue #45290, Selecting passes in image editor does no longer work
1 changed files with 2 additions and 3 deletions

View File

@ -333,8 +333,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);
@ -352,6 +350,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;
@ -406,7 +405,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;