Ver código fonte

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
clayjohn 1 ano atrás
pai
commit
999c7e0392
1 arquivos alterados com 2 adições e 2 exclusões
  1. 2 2
      main/main.cpp

+ 2 - 2
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() {