diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-18 11:13:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-18 11:13:35 +0100 |
| commit | 4cc309291e72d44f0d8048f44f898032bdcc34eb (patch) | |
| tree | 6b9db261d193317b9e9d27104ef4b3a571817467 /main/main.cpp | |
| parent | c34b1107848423ac7ebc33273aa3d380a38792cf (diff) | |
| parent | ff2871f9ac73e9f11af25bdce71400bb4a1d24ae (diff) | |
| download | redot-engine-4cc309291e72d44f0d8048f44f898032bdcc34eb.tar.gz | |
Merge pull request #47119 from Calinou/tweak-editor-splash-screen-color
Tweak the editor splash screen color to better match the default theme
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp index 67152bb52a..951fce35ba 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1662,7 +1662,13 @@ Error Main::setup2(Thread::ID p_main_tid_override) { } } - Color boot_bg_color = GLOBAL_DEF("application/boot_splash/bg_color", boot_splash_bg_color); +#if defined(TOOLS_ENABLED) && !defined(NO_EDITOR_SPLASH) + const Color boot_bg_color = + GLOBAL_DEF("application/boot_splash/bg_color", + (editor || project_manager) ? boot_splash_editor_bg_color : boot_splash_bg_color); +#else + const Color boot_bg_color = GLOBAL_DEF("application/boot_splash/bg_color", boot_splash_bg_color); +#endif if (boot_logo.is_valid()) { RenderingServer::get_singleton()->set_boot_image(boot_logo, boot_bg_color, boot_logo_scale, boot_logo_filter); |