From 8dfdd248b54b76c4a45db6f253398bc621142b42 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 24 Sep 2018 15:41:12 +0200 Subject: Fix T56895: crash loading template with Load UI unchecked. --- source/blender/windowmanager/intern/wm_files.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source/blender/windowmanager') 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); -- cgit v1.2.3