From 7ba71fb24346fb87f50a9eb4aa6b675c31507528 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Sun, 9 Apr 2017 20:02:04 -0300 Subject: Restored (And auto-generated) splash image --- main/main.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'main/main.cpp') diff --git a/main/main.cpp b/main/main.cpp index e4e2616698..0fa795b214 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -28,6 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "main.h" +#include "app_icon.h" #include "core/register_core_types.h" #include "drivers/register_driver_types.h" #include "global_config.h" @@ -885,6 +886,9 @@ Error Main::setup2() { } else if (init_fullscreen) { OS::get_singleton()->set_window_fullscreen(true); } + + register_server_types(); + MAIN_PRINT("Main: Load Remaps"); Color clear = GLOBAL_DEF("rendering/viewport/default_clear_color", Color(0.3, 0.3, 0.3)); @@ -953,7 +957,6 @@ Error Main::setup2() { MAIN_PRINT("Main: Load Scene Types"); register_scene_types(); - register_server_types(); GLOBAL_DEF("display/mouse_cursor/custom_image", String()); GLOBAL_DEF("display/mouse_cursor/custom_image_hotspot", Vector2()); -- cgit v1.2.3