diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-24 14:14:59 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-24 14:14:59 +0300 |
| commit | 6a65fc34565da167d686d0ea14f11f73f909d19d (patch) | |
| tree | 22b2cbcc614278faa1d3847aafb4371453b2dcf9 /source/blender/render | |
| parent | 752fc35fa15b6bfee0309354ffcbf5c78211e8a6 (diff) | |
| parent | e68771fa8760035050f476895ebe791c4857f91b (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/modifiers/intern/MOD_wireframe.c
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 999e0f7f70e..ea3939cfd99 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -3413,11 +3413,14 @@ 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) { + if (is_exr_rr && is_float) { ok = RE_WriteRenderResult(reports, rr, name, &rd->im_format, rv->name, -1); render_print_save_message(reports, name, ok, errno); |