diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-11-12 13:52:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-12 13:52:25 +0300 |
| commit | 2d96666a71e2fbd04b3608a6344f0dbc656cc95c (patch) | |
| tree | 06270535ba7796529b73b85553a55d28a142ebe5 /source/blender/windowmanager | |
| parent | 6cbccdd31ca60819e816f164a4828b113caddd73 (diff) | |
Fix for factory settings loading without UI
When load-ui was disabled, resetting factory settings kept existing UI too.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index e87be231025..86da2ef32ba 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -768,6 +768,10 @@ int wm_homefile_read_exec(bContext *C, wmOperator *op) } } } + else { + /* always load UI for factory settings (prefs will re-init) */ + G.fileflags &= ~G_FILE_NO_UI; + } return wm_homefile_read(C, op->reports, from_memory, filepath) ? OPERATOR_FINISHED : OPERATOR_CANCELLED; } |