From 95ca3f6536f1b756a0c87578f8d9d757ba9cd3a4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 6 Dec 2019 00:26:25 +1100 Subject: Fix T72169: "New File" loads UI, even when disabled Partially reverts b500f427009f0, callers now set this flag. --- source/blender/blenkernel/intern/blendfile.c | 2 +- source/blender/windowmanager/intern/wm_init_exit.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'source') diff --git a/source/blender/blenkernel/intern/blendfile.c b/source/blender/blenkernel/intern/blendfile.c index 0d94fbe648f..36f0950cd08 100644 --- a/source/blender/blenkernel/intern/blendfile.c +++ b/source/blender/blenkernel/intern/blendfile.c @@ -154,7 +154,7 @@ static void setup_app_data(bContext *C, else if (BLI_listbase_is_empty(&bfd->main->screens)) { mode = LOAD_UNDO; } - else if ((G.fileflags & G_FILE_NO_UI) && (is_startup == false)) { + else if (G.fileflags & G_FILE_NO_UI) { mode = LOAD_UI_OFF; } else { diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index c8c35ba1bfc..a6d3adacc14 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -291,6 +291,8 @@ void WM_init(bContext *C, int argc, const char **argv) * otherwise the versioning cannot find the default studio-light. */ BKE_studiolight_init(); + BLI_assert((G.fileflags & G_FILE_NO_UI) == 0); + wm_homefile_read(C, NULL, G.factory_startup, -- cgit v1.2.3