diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-04-19 19:55:48 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-04-19 19:55:48 +0200 |
| commit | 9ab8461a3e894a22ea6312b1c431faad8788f774 (patch) | |
| tree | 61a7544ce65fa15ddc0618c3baff1cfc7bd9174f | |
| parent | a3fbabf4a1a4b2fd5cfad3802b93ffd5a851feb2 (diff) | |
| parent | 0ee8b74101a4273fa333b8988a3a9d69757c7eae (diff) | |
Merge pull request #4375 from eska014/fix-web-clear-color
Fix default clear color in web export
| -rw-r--r-- | main/main.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/main/main.cpp b/main/main.cpp index 9c98e3780d..532e8708a6 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -919,14 +919,16 @@ Error Main::setup2() { MAIN_PRINT("Main: Image"); VisualServer::get_singleton()->set_boot_image(splash, boot_splash_bg_color,false); #endif - MAIN_PRINT("Main: DCC"); - VisualServer::get_singleton()->set_default_clear_color(GLOBAL_DEF("render/default_clear_color",Color(0.3,0.3,0.3))); - MAIN_PRINT("Main: END"); } Image icon(app_icon_png); OS::get_singleton()->set_icon(icon); } + + MAIN_PRINT("Main: DCC"); + VisualServer::get_singleton()->set_default_clear_color(GLOBAL_DEF("render/default_clear_color",Color(0.3,0.3,0.3))); + MAIN_PRINT("Main: END"); + GLOBAL_DEF("application/icon",String()); Globals::get_singleton()->set_custom_property_info("application/icon",PropertyInfo(Variant::STRING,"application/icon",PROPERTY_HINT_FILE,"*.png,*.webp")); |