diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2015-05-12 17:36:52 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2015-05-12 17:38:24 +0300 |
| commit | 15016e14977abdf350c7b452d0333e98e75d5426 (patch) | |
| tree | 406478fc7b3fbad4226df1ff42c6561a51e26a68 /source/blender/render | |
| parent | f0f481031cc5eb57e848ca11a6989565c74a0e56 (diff) | |
small cleanup on render_result_new()
(making the duplicate code more like the original one)
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/render_result.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index 019484f7ed2..525c035b13d 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -562,7 +562,7 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf RenderView *rv; SceneRenderLayer *srl; int rectx, recty; - int nr, i; + int nr; rectx = BLI_rcti_size_x(partrct); recty = BLI_rcti_size_y(partrct); @@ -728,15 +728,11 @@ RenderResult *render_result_new(Render *re, rcti *partrct, int crop, int savebuf if (strcmp(view, viewname) != 0) continue; - if (rr->do_exr_tile) { + if (rr->do_exr_tile) IMB_exr_add_view(rl->exrhandle, view); - for (i=0; i < 4; i++) - IMB_exr_add_channel(rl->exrhandle, rl->name, name_from_passtype(SCE_PASS_COMBINED, i), view, 0, 0, NULL); - } - else { - render_layer_add_pass(rr, rl, 4, SCE_PASS_COMBINED, view); - } + /* a renderlayer should always have a Combined pass */ + render_layer_add_pass(rr, rl, 4, SCE_PASS_COMBINED, view); } /* note, this has to be in sync with scene.c */ |