[Bf-blender-cvs] [64a6c78a9a2] master: Fix T57328: 'Save As Copy' prints warning
Campbell Barton
noreply at git.blender.org
Mon Oct 22 05:52:05 CEST 2018
Commit: 64a6c78a9a2a789b5be6ba5e3162a10f90a2ac5c
Author: Campbell Barton
Date: Mon Oct 22 14:51:06 2018 +1100
Branches: master
https://developer.blender.org/rB64a6c78a9a2a789b5be6ba5e3162a10f90a2ac5c
Fix T57328: 'Save As Copy' prints warning
===================================================================
M source/blender/windowmanager/intern/wm_files.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 796103677bf..6182a8c5ec6 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -2093,6 +2093,7 @@ static int wm_save_as_mainfile_exec(bContext *C, wmOperator *op)
Main *bmain = CTX_data_main(C);
char path[FILE_MAX];
int fileflags;
+ const bool is_save_as = (op->type->invoke == wm_save_as_mainfile_invoke);
save_set_compress(op);
@@ -2124,7 +2125,7 @@ static int wm_save_as_mainfile_exec(bContext *C, wmOperator *op)
WM_event_add_notifier(C, NC_WM | ND_FILESAVE, NULL);
- if (RNA_boolean_get(op->ptr, "exit")) {
+ if (!is_save_as && RNA_boolean_get(op->ptr, "exit")) {
wm_exit_schedule_delayed(C);
}
More information about the Bf-blender-cvs
mailing list