diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-07-18 09:48:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-07-18 09:58:38 +0300 |
commit | 20c725ed62f86aebf555221731c8e7b7dbd05120 (patch) | |
tree | 16da2b6922df96efcdfc15d389f1d967e888b4c3 /source/blender | |
parent | 098f60f1b8ccf974d2ede86b89bb4491af4d08b2 (diff) |
Cleanup: remove redundant preference check
Missing from f2df5206987f6, harmless but confusing to leave
in checks for preferences having asked to skip them.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 47e04bba4c1..48b09b0d329 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -623,8 +623,6 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports) /* we didn't succeed, now try to read Blender file */ if (retval == BKE_READ_EXOTIC_OK_BLEND) { - bool use_data = true; - bool use_userdef = false; const int G_f_orig = G.f; ListBase wmbase; @@ -670,18 +668,14 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports) wm_window_match_do(C, &wmbase, &bmain->wm, &bmain->wm); WM_check(C); /* opens window(s), checks keymaps */ - if (retval == BKE_BLENDFILE_READ_OK_USERPREFS) { - /* in case a userdef is read from regular .blend */ - wm_init_userdef(bmain, false); - use_userdef = true; - } - if (retval != BKE_BLENDFILE_READ_FAIL) { if (do_history) { wm_history_file_update(); } } + const bool use_data = true; + const bool use_userdef = false; wm_file_read_post(C, false, false, use_data, use_userdef, false); success = true; |