diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-10-22 06:59:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-22 06:59:12 +0300 |
| commit | 71466cac1efae5e942596ec25c8787478f8356b0 (patch) | |
| tree | 6915cecf1e70e9f8139c31097ae42b1c73130221 /source/blender/windowmanager | |
| parent | 7756973b0c35c5759db240158717d0f5bf0f45dc (diff) | |
| parent | 64a6c78a9a2a789b5be6ba5e3162a10f90a2ac5c (diff) | |
Merge branch 'master' into blender2.8
Reverts: 92fd931e536
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 1195348ed0d..7d3599b2f11 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -2167,6 +2167,7 @@ static int wm_save_as_mainfile_exec(bContext *C, wmOperator *op) Main *bmain = CTX_data_main(C); char path[FILE_MAX]; int fileflags, orig_fileflags; + const bool is_save_as = (op->type->invoke == wm_save_as_mainfile_invoke); save_set_compress(op); @@ -2209,11 +2210,9 @@ static int wm_save_as_mainfile_exec(bContext *C, wmOperator *op) WM_event_add_notifier(C, NC_WM | ND_FILESAVE, NULL); -#if 0 /* XXX: Remove? This is not currently defined as a valid property */ - if (RNA_boolean_get(op->ptr, "exit")) { + if (!is_save_as && RNA_boolean_get(op->ptr, "exit")) { wm_exit_schedule_delayed(C); } -#endif return OPERATOR_FINISHED; } |