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-06-12 05:21:21 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-06-12 05:30:49 +0300
commitfcb534e336c3b9d9065c5bbc9143bcc305497975 (patch)
tree45dcf47f367fc31e4c6896ef4f27fcf95bc5ad50 /source/blender/python/intern/bpy_app.c
parent2459a1a214b950cc8baa4e8fcb48e7dfada58b77 (diff)
UI: alternate fix for T65702, handling of auto-saving userprefs
The behavior for loading factory settings wasn't clear for users. This commit changes the behavior: - Loading factory settings always disables auto-save for the current session. - The internal setting to skip saving on exit is now exposed in the preferences (when enabled). - The menu item "Load Factory Settings (Temporary)" has been removed since it's always temporary. This way users can always reset factory settings without having to consider the combination of options that might cause their preferences to be overwritten at exit. If they want to enable auto-save for the current session this can be done from the preferences.
Diffstat (limited to 'source/blender/python/intern/bpy_app.c')
-rw-r--r--source/blender/python/intern/bpy_app.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/python/intern/bpy_app.c b/source/blender/python/intern/bpy_app.c
index f0a3c7f4d5f..9ffb4cb4821 100644
--- a/source/blender/python/intern/bpy_app.c
+++ b/source/blender/python/intern/bpy_app.c
@@ -508,6 +508,12 @@ static PyGetSetDef bpy_app_getsets[] = {
(char *)bpy_app_global_flag_doc,
(void *)G_FLAG_EVENT_SIMULATE},
+ {(char *)"use_userpref_skip_save_on_exit",
+ bpy_app_global_flag_get,
+ bpy_app_global_flag_set,
+ (char *)bpy_app_global_flag_doc,
+ (void *)G_FLAG_USERPREF_NO_SAVE_ON_EXIT},
+
{(char *)"binary_path_python",
bpy_app_binary_path_python_get,
NULL,