diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-06-19 07:05:18 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-06-19 07:29:24 +0300 |
| commit | 642b19c8b8a501c6a0f4b0ae36daef304bfd8ee1 (patch) | |
| tree | 84746503da08312db316495b00c542e8765c0310 | |
| parent | 41f0697501f9c5ea16415d2db230fda6c6cb76e4 (diff) | |
Fix app-templates not resetting the user interface
Regression in 45b5f4e3dff75
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index b2753886f69..055724926f2 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -905,6 +905,13 @@ void wm_homefile_read(bContext *C, SET_FLAG_FROM_TEST(G.f, (U.flag & USER_SCRIPT_AUTOEXEC_DISABLE) == 0, G_FLAG_SCRIPT_AUTOEXEC); } + if (use_data) { + if (reset_app_template) { + /* Always load UI when switching to another template. */ + G.fileflags &= ~G_FILE_NO_UI; + } + } + if (use_userdef || reset_app_template) { #ifdef WITH_PYTHON /* This only runs once Blender has already started. */ @@ -1109,13 +1116,6 @@ void wm_homefile_read(bContext *C, BLI_strncpy(U.app_template, app_template_override, sizeof(U.app_template)); } - if (use_data) { - if (reset_app_template) { - /* Always load UI when switching to another template. */ - G.fileflags &= ~G_FILE_NO_UI; - } - } - bmain = CTX_data_main(C); if (use_userdef) { |