diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-11-25 04:45:12 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-11-25 04:51:23 +0400 |
commit | c5944812d69f04b48f982402a4e5518edb398ef0 (patch) | |
tree | 133d5d9ff8c8e5ae73c9d9eee48b537f14c25be5 /source/blender/windowmanager/intern/wm_files.c | |
parent | 9c262e5649303eff26e7645079185c250e4420ff (diff) |
User Defaults: Change user defaults based on decission by new UI team - T37518
Currently these changes are not saved in startup.blend to avoid bloating
our repo whenever we want to make minor changes.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_files.c')
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index f7bbb84facc..b3be3b4cc0c 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -282,7 +282,7 @@ static void wm_window_match_do(bContext *C, ListBase *oldwmlist) } /* in case UserDef was read, we re-initialize all, and do versioning */ -static void wm_init_userdef(bContext *C) +static void wm_init_userdef(bContext *C, const bool from_memory) { /* versioning is here */ UI_init_userdef(); @@ -301,6 +301,11 @@ static void wm_init_userdef(bContext *C) else G.f &= ~G_SCRIPT_AUTOEXEC; } + /* avoid re-saving for every small change to our prefs, allow overrides */ + if (from_memory) { + UI_init_userdef_factory(); + } + /* update tempdir from user preferences */ BLI_init_temporary_dir(U.tempdir); @@ -433,7 +438,7 @@ void WM_file_read(bContext *C, const char *filepath, ReportList *reports) if (retval == BKE_READ_FILE_OK_USERPREFS) { /* in case a userdef is read from regular .blend */ - wm_init_userdef(C); + wm_init_userdef(C, false); } if (retval != BKE_READ_FILE_FAIL) { @@ -576,7 +581,7 @@ int wm_homefile_read(bContext *C, ReportList *UNUSED(reports), short from_memory G.fileflags &= ~G_FILE_RELATIVE_REMAP; /* check userdef before open window, keymaps etc */ - wm_init_userdef(C); + wm_init_userdef(C, from_memory); /* match the read WM with current WM */ wm_window_match_do(C, &wmbase); |