From ab9ec193c34ae62af99350f62631f91c9648d5eb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 13 Nov 2021 14:01:59 +1100 Subject: Fix splash screen showing on startup with files loaded by scripts Suppressing the splash was only done when passing in an argument from the command line. Remove G.file_loaded, as it is misleading, only set once on startup, replace with G.relbase_valid which is used everywhere else to check if the file path should be used. --- source/blender/blenkernel/BKE_global.h | 1 - source/creator/creator.c | 3 ++- source/creator/creator_args.c | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index 1e3fe61552a..4f1da0a972f 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -45,7 +45,6 @@ typedef struct Global { /** When set: `G_MAIN->name` contains valid relative base path. */ bool relbase_valid; - bool file_loaded; bool save_over; /** Strings of recent opened files. */ diff --git a/source/creator/creator.c b/source/creator/creator.c index 4171d60b5b6..6daaea38c34 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -551,7 +551,8 @@ int main(int argc, WM_exit(C); } else { - if (!G.file_loaded) { + /* When no file is loaded, show the splash screen. */ + if (!G.relbase_valid) { WM_init_splash(C); } WM_main(C); diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index 943646daa81..896d29e0583 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -2008,8 +2008,6 @@ static int arg_handle_load_file(int UNUSED(argc), const char **argv, void *data) } } - G.file_loaded = 1; - return 0; } -- cgit v1.2.3