archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source 
Conflicts:
	source/blender/modifiers/intern/MOD_wireframe.c
This commit is contained in:
Bastien Montagne
2018-01-24 12:14:59 +01:00
parent 752fc35fa1 e68771fa87
commit 6a65fc3456
6 changed files with 93 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/render/intern/source/pipeline.c
View File

@@ -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);