summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorclayjohn <claynjohn@gmail.com>2024-07-15 14:00:05 -0700
committerclayjohn <claynjohn@gmail.com>2024-07-15 14:00:05 -0700
commit999c7e0392550acd6c6d9f95cde532589c2b2e2d (patch)
treec59b6c5022a41cef2ba104848b9308995e97e7b4 /main
parent97b8ad1af0f2b4a216f6f1263bef4fbc69e56c7b (diff)
downloadredot-engine-999c7e0392550acd6c6d9f95cde532589c2b2e2d.tar.gz
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
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 32eb32142d..ffc25ce4f7 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() {