[Bf-blender-cvs] [18ba66d75ee] master: UI: clarify auto-save preference

[Campbell Barton]

Commit: 18ba66d75ee669bbb433c46ffc0d2516ff423b43
Author: Campbell Barton
Date:   Sun Aug 11 17:51:09 2019 +1000
Branches: master
https://developer.blender.org/rB18ba66d75ee669bbb433c46ffc0d2516ff423b43

UI: clarify auto-save preference

- Grey out the option when factory settings have been loaded.
- Note it it's tool-top that it's ignored when factory settings
  have been loaded.

Suggestions by @JulienKaspar

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

M	release/scripts/startup/bl_ui/space_userpref.py
M	source/blender/makesrna/intern/rna_userdef.c

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

diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 128d6100a27..87baea9cdd8 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -86,7 +86,9 @@ class USERPREF_MT_save_load(Menu):
 
         prefs = context.preferences
 
-        layout.prop(prefs, "use_preferences_save", text="Auto-Save Preferences")
+        row = layout.row()
+        row.active = not bpy.app.use_userpref_skip_save_on_exit
+        row.prop(prefs, "use_preferences_save", text="Auto-Save Preferences")
 
         layout.separator()
 
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 48eee713fc9..a449ed850e9 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -5820,7 +5820,10 @@ void RNA_def_userdef(BlenderRNA *brna)
   /* Preferences Flags */
   prop = RNA_def_property(srna, "use_preferences_save", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "pref_flag", USER_PREF_FLAG_SAVE);
-  RNA_def_property_ui_text(prop, "Save on Exit", "Save preferences on exit when modified");
+  RNA_def_property_ui_text(prop,
+                           "Save on Exit",
+                           "Save preferences on exit when modified "
+                           "(unless factory settings have been loaded)");
 
   prop = RNA_def_property(srna, "is_dirty", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, NULL, "runtime.is_dirty", 0);