diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-25 02:31:37 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-25 02:31:37 +0300 |
| commit | 032129ef3527424de241f381376a3b94a2247965 (patch) | |
| tree | c767ec40502ab920ac823bba936c8b7f3cb8e75b /source/blender/render | |
| parent | ca088a7b126be3e08025b83d6ac6aafa7519985c (diff) | |
| parent | 9b32248894d133c6437174e1470dfefa23a10b87 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/extern/include/RE_pipeline.h | 1 | ||||
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 8 | ||||
| -rw-r--r-- | source/blender/render/intern/source/render_result.c | 13 |
3 files changed, 17 insertions, 5 deletions
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index a0f3a053618..0557efccc2f 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -392,6 +392,7 @@ void RE_updateRenderInstances(Render *re, int flag); /******* defined in render_result.c *********/ bool RE_HasCombinedLayer(RenderResult *res); +bool RE_HasFloatPixels(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 ea3939cfd99..261d9e2e159 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -3395,7 +3395,8 @@ bool RE_WriteRenderViewsImage(ReportList *reports, RenderResult *rr, Scene *scen return false; bool is_mono = BLI_listbase_count_ex(&rr->views, 2) < 2; - bool is_exr_rr = ELEM(rd->im_format.imtype, R_IMF_IMTYPE_OPENEXR, R_IMF_IMTYPE_MULTILAYER); + bool is_exr_rr = ELEM(rd->im_format.imtype, R_IMF_IMTYPE_OPENEXR, R_IMF_IMTYPE_MULTILAYER) && + RE_HasFloatPixels(rr); if (rd->im_format.views_format == R_IMF_VIEWS_MULTIVIEW && is_exr_rr) { @@ -3413,14 +3414,11 @@ bool RE_WriteRenderViewsImage(ReportList *reports, RenderResult *rr, Scene *scen BLI_strncpy(filepath, name, sizeof(filepath)); for (view_id = 0, rv = rr->views.first; rv; rv = rv->next, view_id++) { - /* Sequencer and OpenGL render can't save multiple EXR layers. */ - bool is_float = rv->rect32 == NULL; - if (!is_mono) { BKE_scene_multiview_view_filepath_get(&scene->r, filepath, rv->name, name); } - if (is_exr_rr && is_float) { + if (is_exr_rr) { ok = RE_WriteRenderResult(reports, rr, name, &rd->im_format, rv->name, -1); render_print_save_message(reports, name, ok, errno); diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index c250a91f4cb..10920545b88 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -1417,6 +1417,19 @@ bool RE_HasCombinedLayer(RenderResult *res) return (rv->rect32 || rv->rectf); } +bool RE_HasFloatPixels(RenderResult *res) +{ + RenderView *rview; + + for (rview = res->views.first; rview; rview = rview->next) { + if (rview->rect32 && !rview->rectf) { + return false; + } + } + + return true; +} + bool RE_RenderResult_is_stereo(RenderResult *res) { if (! BLI_findstring(&res->views, STEREO_LEFT_NAME, offsetof(RenderView, name))) |