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:
authorCampbell Barton <ideasman42@gmail.com>2019-05-14 05:23:55 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-05-14 05:37:07 +0300
commit9c9081d9ef5bf97b39f316d68651f7e72266ac5d (patch)
treedb408338842281594a9c61e0b3e757620e547553 /source/blender/windowmanager/intern/wm_init_exit.c
parent34da7f8fddcae003aa9740ba304e624b0154e4d8 (diff)
Preferences: file menu item to temporarily load factory settings
It's common to load factory settings as a test without wanting to overwrite your own settings on exit.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_init_exit.c')
-rw-r--r--source/blender/windowmanager/intern/wm_init_exit.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 797a2edd937..04a3115992f 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -475,9 +475,11 @@ void WM_exit_ext(bContext *C, const bool do_python)
ED_screen_exit(C, win, WM_window_get_active_screen(win));
}
- if (U.runtime.is_dirty && !G.background) {
- if (U.pref_flag & USER_PREF_FLAG_SAVE) {
- BKE_blendfile_userdef_write_all(NULL);
+ if (!G.background) {
+ if ((U.pref_flag & USER_PREF_FLAG_SAVE) && ((G.f & G_FLAG_USERPREF_NO_SAVE_ON_EXIT) == 0)) {
+ if (U.runtime.is_dirty) {
+ BKE_blendfile_userdef_write_all(NULL);
+ }
}
}
}