[Bf-blender-cvs] [c51cfbb] master: Fix own mistake in recent rB8b2a45052093, broke saving render results as images in some cases.
Bastien Montagne
noreply at git.blender.org
Mon Sep 5 13:14:48 CEST 2016
Commit: c51cfbbc7f7be9b58f3354e0efe19aa488d984a9
Author: Bastien Montagne
Date: Mon Sep 5 13:12:05 2016 +0200
Branches: master
https://developer.blender.org/rBc51cfbbc7f7be9b58f3354e0efe19aa488d984a9
Fix own mistake in recent rB8b2a45052093, broke saving render results as images in some cases.
Reported by sebastian_k over IRC, thanks.
To be backported to 2.78.
===================================================================
M source/blender/editors/space_image/image_ops.c
===================================================================
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 1f591b5..a89d349 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1608,6 +1608,11 @@ static int save_image_options_init(SaveImageOptions *simopts, SpaceImage *sima,
/* imtype */
simopts->im_format = scene->r.im_format;
is_depth_set = true;
+ if (!BKE_image_is_multiview(ima)) {
+ /* In case multiview is disabled, render settings would be invalid for render result in this area. */
+ simopts->im_format.stereo3d_format = *ima->stereo3d_format;
+ simopts->im_format.views_format = ima->views_format;
+ }
}
else {
if (ima->source == IMA_SRC_GENERATED) {
More information about the Bf-blender-cvs
mailing list