summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2024-07-17 11:44:23 +0200
committerRémi Verschelde <rverschelde@gmail.com>2024-07-17 11:44:23 +0200
commitfe427ff20368df03cbeb44276a87e41eab16f60d (patch)
tree2111e6fa1c7a061bf715ca5e50868e93b5c56aae /main
parent38a537c011a734a652cc2c8e551ad6a422354714 (diff)
parent999c7e0392550acd6c6d9f95cde532589c2b2e2d (diff)
downloadredot-engine-fe427ff20368df03cbeb44276a87e41eab16f60d.tar.gz
Merge pull request #94404 from clayjohn/android-clear-color
Restore default clear color after displaying boot splash
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 cfa0f9dfda..1cabe43065 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -2916,8 +2916,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());
@@ -3217,6 +3215,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() {