diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-26 15:23:18 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-08 00:35:12 +0300 |
| commit | ed7260071bc397dd389737088fce869e8adc0dc3 (patch) | |
| tree | af3d2de6a41ef39d3dd3248645e3cb3aca11bc3a /source/blender/render | |
| parent | e0936e74abc5c9349fa55abe0f79f96f5add9f37 (diff) | |
Fix EXR multilayer compositing result saving issues.
* It was saved as Combined.Combined instead of Composite.Combined.
* It was written even if no compositing was enabled.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/extern/include/RE_pipeline.h | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 4 | ||||
| -rw-r--r-- | source/blender/render/intern/source/render_result.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index 61d0750a9c6..a94d048e26d 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -387,7 +387,7 @@ void RE_updateRenderInstances(Render *re, int flag); /******* defined in render_result.c *********/ -bool RE_HasFakeLayer(RenderResult *res); +bool RE_HasCombinedLayer(RenderResult *res); bool RE_RenderResult_is_stereo(RenderResult *res); struct RenderView *RE_RenderViewGetById(struct RenderResult *res, const int view_id); struct RenderView *RE_RenderViewGetByName(struct RenderResult *res, const char *viewname); diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 2eac20214ba..96a9bb44bcc 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -374,6 +374,7 @@ void RE_AcquireResultImageViews(Render *re, RenderResult *rr) render_result_views_shallowcopy(rr, re->result); rv = rr->views.first; + rr->have_combined = (rv->rectf != NULL); /* active layer */ rl = render_get_active_layer(re, re->result); @@ -392,7 +393,6 @@ 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; @@ -431,6 +431,7 @@ void RE_AcquireResultImage(Render *re, RenderResult *rr, const int view_id) /* actview view */ rv = RE_RenderViewGetById(re->result, view_id); + rr->have_combined = (rv->rectf != NULL); rr->rectf = rv->rectf; rr->rectz = rv->rectz; @@ -447,7 +448,6 @@ void RE_AcquireResultImage(Render *re, RenderResult *rr, const int view_id) rr->rectz = RE_RenderLayerGetPass(rl, RE_PASSNAME_Z, rv->name); } - rr->have_combined = (rv->rectf != NULL); rr->layers = re->result->layers; rr->views = re->result->views; diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index aa0c7357302..dbb2ef7ae51 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -883,7 +883,7 @@ bool RE_WriteRenderResult(ReportList *reports, RenderResult *rr, const char *fil char passname[EXR_PASS_MAXNAME]; for (a = 0; a < 4; a++) { set_pass_name(passname, RE_PASSNAME_COMBINED, a, "RGBA"); - IMB_exr_add_channel(exrhandle, RE_PASSNAME_COMBINED, passname, + IMB_exr_add_channel(exrhandle, "Composite", passname, chan_view, 4, 4 * width, rview->rectf + a, use_half_float); } @@ -1370,7 +1370,7 @@ void render_result_rect_get_pixels(RenderResult *rr, unsigned int *rect, int rec /*************************** multiview functions *****************************/ -bool RE_HasFakeLayer(RenderResult *res) +bool RE_HasCombinedLayer(RenderResult *res) { RenderView *rv; |