[Bf-blender-cvs] [75958326ade] master: WM: re-enable auto-save after loading the users preferences

Campbell Barton noreply at git.blender.org
Wed Jun 12 10:10:19 CEST 2019


Commit: 75958326ade000bc391be90734aac1a28dde3ae2
Author: Campbell Barton
Date:   Wed Jun 12 17:53:18 2019 +1000
Branches: master
https://developer.blender.org/rB75958326ade000bc391be90734aac1a28dde3ae2

WM: re-enable auto-save after loading the users preferences

Minor change, only apples when loading factory settings,
then reverting to saved.

===================================================================

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 1feab316010..0c525d6946c 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -1829,9 +1829,7 @@ static int wm_userpref_read_exec(bContext *C, wmOperator *op)
                    NULL);
 
   wm_userpref_read_exceptions(&U, &U_backup);
-  if (use_factory_settings) {
-    G.f |= G_FLAG_USERPREF_NO_SAVE_ON_EXIT;
-  }
+  SET_FLAG_FROM_TEST(G.f, use_factory_settings, G_FLAG_USERPREF_NO_SAVE_ON_EXIT);
 
   Main *bmain = CTX_data_main(C);
 
@@ -1960,9 +1958,7 @@ static int wm_homefile_read_exec(bContext *C, wmOperator *op)
 
   if (use_userdef) {
     wm_userpref_read_exceptions(&U, &U_backup);
-    if (use_factory_settings) {
-      G.f |= G_FLAG_USERPREF_NO_SAVE_ON_EXIT;
-    }
+    SET_FLAG_FROM_TEST(G.f, use_factory_settings, G_FLAG_USERPREF_NO_SAVE_ON_EXIT);
   }
 
   return OPERATOR_FINISHED;



More information about the Bf-blender-cvs mailing list