diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-04-09 20:02:04 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-04-09 20:03:38 -0300 |
| commit | 7ba71fb24346fb87f50a9eb4aa6b675c31507528 (patch) | |
| tree | 46ab1cb9a5379e51207b4c3af48348c97f38642b /main/main.cpp | |
| parent | d596946a454dd9a89fdf84232f5ff7ce1add4f46 (diff) | |
Restored (And auto-generated) splash image
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
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()); |