From 999c7e0392550acd6c6d9f95cde532589c2b2e2d Mon Sep 17 00:00:00 2001 From: clayjohn Date: Mon, 15 Jul 2024 14:00:05 -0700 Subject: [PATCH] Restore default clear color after displaying boot splash On Android the boot splash can be shown at a different time, so the clear color restore needs to happen within the `setup_boot_logo` function --- main/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/main.cpp b/main/main.cpp index 32eb32142d9..ffc25ce4f76 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -2917,8 +2917,6 @@ Error Main::setup2(bool p_show_boot_logo) { MAIN_PRINT("Main: Clear Color"); DisplayServer::set_early_window_clear_color_override(false); - RenderingServer::get_singleton()->set_default_clear_color( - GLOBAL_GET("rendering/environment/defaults/default_clear_color")); GLOBAL_DEF_BASIC(PropertyInfo(Variant::STRING, "application/config/icon", PROPERTY_HINT_FILE, "*.png,*.webp,*.svg"), String()); GLOBAL_DEF(PropertyInfo(Variant::STRING, "application/config/macos_native_icon", PROPERTY_HINT_FILE, "*.icns"), String()); @@ -3219,6 +3217,8 @@ void Main::setup_boot_logo() { } #endif } + RenderingServer::get_singleton()->set_default_clear_color( + GLOBAL_GET("rendering/environment/defaults/default_clear_color")); } String Main::get_rendering_driver_name() {