Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-06-19 15:28:54 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-06-19 16:04:05 +0300
commit11c9702dd40f1461ee2d2c1136909a867d4f06f9 (patch)
treedf2e3aa6f1e63539978df9961a0bb991df172879 /source/blender/windowmanager
parent54e6b262a14b23160fdecfec68f3e22dcf70bb3e (diff)
Fix T65902: save all modified images should not try to save .psd files
We can't save these without data loss, so don't try to do this.
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r--source/blender/windowmanager/intern/wm_files.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 0c525d6946c..fe93e39b085 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -2949,11 +2949,9 @@ static void wm_block_file_close_save(bContext *C, void *arg_block, void *arg_dat
UI_popup_block_close(C, win, arg_block);
if (save_images_when_file_is_closed) {
- ReportList *reports = CTX_wm_reports(C);
- if (!ED_image_save_all_modified(C, reports)) {
+ if (!ED_image_should_save_modified(C)) {
execute_callback = false;
}
- WM_report_banner_show();
}
Main *bmain = CTX_data_main(C);
@@ -3059,10 +3057,10 @@ static uiBlock *block_create__close_file_dialog(struct bContext *C, struct ARegi
0,
0,
"");
+ }
- LISTBASE_FOREACH (Report *, report, &reports.list) {
- uiItemL(layout, report->message, ICON_ERROR);
- }
+ LISTBASE_FOREACH (Report *, report, &reports.list) {
+ uiItemL(layout, report->message, ICON_ERROR);
}
BKE_reports_clear(&reports);