diff options
| author | Germano Cavalcante <germano.costa@ig.com.br> | 2022-08-08 17:00:10 +0300 |
|---|---|---|
| committer | Germano Cavalcante <germano.costa@ig.com.br> | 2022-08-08 17:00:10 +0300 |
| commit | 47f433c7767b74b3ca8af2db3c6d2e05ac6e7e7e (patch) | |
| tree | 094ba4eccb073257a302a65eda8ed6eea557c6cc /source/blender/blenkernel/intern/image_save.cc | |
| parent | e22628c70bf221acf084e20373da9d40ebc2bfa8 (diff) | |
| parent | b72eddac6190353714745756dcc335f98cda1369 (diff) | |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'source/blender/blenkernel/intern/image_save.cc')
| -rw-r--r-- | source/blender/blenkernel/intern/image_save.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/image_save.cc b/source/blender/blenkernel/intern/image_save.cc index fec1bc8cd1a..d366e9362e8 100644 --- a/source/blender/blenkernel/intern/image_save.cc +++ b/source/blender/blenkernel/intern/image_save.cc @@ -144,13 +144,9 @@ bool BKE_image_save_options_init(ImageSaveOptions *opts, opts->im_format.color_management = R_IMF_COLOR_MANAGEMENT_FOLLOW_SCENE; - if (ibuf->name[0] == '\0' || ima->source == IMA_SRC_TILED) { - BLI_strncpy(opts->filepath, ima->filepath, sizeof(opts->filepath)); - BLI_path_abs(opts->filepath, ID_BLEND_PATH_FROM_GLOBAL(&ima->id)); - } - else { - BLI_strncpy(opts->filepath, ibuf->name, sizeof(opts->filepath)); - } + /* Compute filepath, but don't resolve multiview and UDIM which are handled + * by the image saving code itself. */ + BKE_image_user_file_path_ex(bmain, iuser, ima, opts->filepath, false, false); /* sanitize all settings */ |