diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-16 10:39:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-16 10:39:53 +0200 |
| commit | 6ba1b4e371a875df527026725e3dc47d7cca8cf0 (patch) | |
| tree | 628fe5a76f9f95b7868d75ea54527fd43ff6e352 /main | |
| parent | f6f9f890782428169a8d29fe0fb4851220d675c5 (diff) | |
| parent | 786a7341a7443390e2c98ff7fe00a995f4d8cf67 (diff) | |
Merge pull request #29764 from Calinou/boot-splash-no-filter-option
Add an option to disable boot splash filtering
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp index 7e4fdeeaa7..61f54b1b0a 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1154,6 +1154,7 @@ Error Main::setup2(Thread::ID p_main_tid_override) { if (show_logo) { //boot logo! String boot_logo_path = GLOBAL_DEF("application/boot_splash/image", String()); bool boot_logo_scale = GLOBAL_DEF("application/boot_splash/fullsize", true); + bool boot_logo_filter = GLOBAL_DEF("application/boot_splash/use_filter", true); ProjectSettings::get_singleton()->set_custom_property_info("application/boot_splash/image", PropertyInfo(Variant::STRING, "application/boot_splash/image", PROPERTY_HINT_FILE, "*.png")); Ref<Image> boot_logo; @@ -1170,7 +1171,7 @@ Error Main::setup2(Thread::ID p_main_tid_override) { Color boot_bg_color = GLOBAL_DEF("application/boot_splash/bg_color", boot_splash_bg_color); if (boot_logo.is_valid()) { OS::get_singleton()->_msec_splash = OS::get_singleton()->get_ticks_msec(); - VisualServer::get_singleton()->set_boot_image(boot_logo, boot_bg_color, boot_logo_scale); + VisualServer::get_singleton()->set_boot_image(boot_logo, boot_bg_color, boot_logo_scale, boot_logo_filter); } else { #ifndef NO_DEFAULT_BOOT_LOGO |