diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-05-30 15:23:45 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-05-30 17:24:12 +0300 |
| commit | fc1ae52994016fc4d43053caa412212726f7e223 (patch) | |
| tree | 7fa498e890ab0ecaa2ce96e925c68209981ea3e8 /source/blender/editors/space_image | |
| parent | 65bd9974d1a6e3b66b9613a60e521a5211631304 (diff) | |
Fix T98444: Image.save_render not using scene output file type
Also simplify logic because (source == IMA_SRC_VIEWER) and
ELEM(type, IMA_TYPE_R_RESULT, IMA_TYPE_COMPOSITE) are the same
thing.
Diffstat (limited to 'source/blender/editors/space_image')
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 69efd5eaabf..bd1cb3a345e 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -1727,7 +1727,7 @@ static ImageSaveData *image_save_as_init(bContext *C, wmOperator *op) isd->image = image; isd->iuser = iuser; - if (!BKE_image_save_options_init(&isd->opts, bmain, scene, image, iuser, true)) { + if (!BKE_image_save_options_init(&isd->opts, bmain, scene, image, iuser, true, false)) { BKE_image_save_options_free(&isd->opts); MEM_freeN(isd); return NULL; @@ -1994,7 +1994,7 @@ static int image_save_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } - if (!BKE_image_save_options_init(&opts, bmain, scene, image, iuser, false)) { + if (!BKE_image_save_options_init(&opts, bmain, scene, image, iuser, false, false)) { BKE_image_save_options_free(&opts); return OPERATOR_CANCELLED; } @@ -2266,7 +2266,7 @@ bool ED_image_save_all_modified(const bContext *C, ReportList *reports) if (image_has_valid_path(ima)) { ImageSaveOptions opts; Scene *scene = CTX_data_scene(C); - if (!BKE_image_save_options_init(&opts, bmain, scene, ima, NULL, false)) { + if (!BKE_image_save_options_init(&opts, bmain, scene, ima, NULL, false, false)) { bool saved_successfully = BKE_image_save(reports, bmain, ima, NULL, &opts); ok = ok && saved_successfully; } |