Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-24 21:22:48 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #94404 from clayjohn/android-clear-color

Browse Source 
Restore default clear color after displaying boot splash
This commit is contained in:
Rémi Verschelde 2024-07-17 11:44:23 +02:00
commit fe427ff203
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/main.cpp
View File

@ -2916,8 +2916,6 @@ Error Main::setup2(bool p_show_boot_logo) {
MAIN_PRINT("Main: Clear Color"); MAIN_PRINT("Main: Clear Color");
DisplayServer::set_early_window_clear_color_override(false); 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_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()); 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 #endif
} }
RenderingServer::get_singleton()->set_default_clear_color(
GLOBAL_GET("rendering/environment/defaults/default_clear_color"));
} }
String Main::get_rendering_driver_name() { String Main::get_rendering_driver_name() {