diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 16:41:12 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 16:48:50 +0300 |
| commit | 8dfdd248b54b76c4a45db6f253398bc621142b42 (patch) | |
| tree | 33f551efcc2fb3be1a3ac4565afb27a3dc5da12b /source/blender/windowmanager | |
| parent | 8f51308dba0a5dc2f70c273e2de9fb7d102ed2f9 (diff) | |
Fix T56895: crash loading template with Load UI unchecked.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 231adfc746a..798b505e257 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -1689,6 +1689,11 @@ static int wm_homefile_read_exec(bContext *C, wmOperator *op) RNA_property_string_get(op->ptr, prop_app_template, app_template_buf); app_template = app_template_buf; + if (!STREQ(app_template, U.app_template)) { + /* Always load UI when switching to another template. */ + G.fileflags &= ~G_FILE_NO_UI; + } + /* Always load preferences when switching templates with own preferences. */ use_userdef = wm_app_template_has_userpref(app_template) || wm_app_template_has_userpref(U.app_template); |