diff options
| author | Juan Linietsky | 2017-12-16 16:11:13 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2017-12-16 16:11:13 -0300 |
| commit | cf84ee22a9b884453ac8d50b4c3216baf2e3897a (patch) | |
| tree | 88136b39a990bf218cec062cbbf47d785a5c1ea5 /main/main.cpp | |
| parent | c93cb30cbb8374bad0a5fac8f63b3fc6915d411d (diff) | |
| download | godot-cf84ee22a9b884453ac8d50b4c3216baf2e3897a.tar.gz godot-cf84ee22a9b884453ac8d50b4c3216baf2e3897a.tar.zst godot-cf84ee22a9b884453ac8d50b4c3216baf2e3897a.zip | |
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/main/main.cpp b/main/main.cpp index c6e20f6d3..ab520c5e7 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -42,6 +42,7 @@ #include "script_debugger_remote.h" #include "servers/register_server_types.h" #include "splash.gen.h" +#include "splash_editor.gen.h" #include "input_map.h" #include "io/resource_loader.h" @@ -1051,7 +1052,12 @@ Error Main::setup2(Thread::ID p_main_tid_override) { #ifndef NO_DEFAULT_BOOT_LOGO MAIN_PRINT("Main: Create bootsplash"); +#if defined(TOOLS_ENABLED) && !defined(NO_EDITOR_SPLASH) + + Ref<Image> splash = editor ? memnew(Image(boot_splash_editor_png)) : memnew(Image(boot_splash_png)); +#else Ref<Image> splash = memnew(Image(boot_splash_png)); +#endif MAIN_PRINT("Main: ClearColor"); VisualServer::get_singleton()->set_default_clear_color(boot_splash_bg_color); |