diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-05 22:29:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-05 22:29:06 +0100 |
| commit | f9dad47478bf3a089b34f2e099164a5d4b388ef5 (patch) | |
| tree | 98a32a5d968445e9d49284c73c8b11e916559e7a /main/main.cpp | |
| parent | 4de0768cdbaf68781214601e679548a69c15c673 (diff) | |
| parent | 2ac9f37b171f7b90826194ecd1aa93e0db95c563 (diff) | |
Merge pull request #46701 from HaSa1002/fix-lossy-cursor
Move cursor shape loading after module loading
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/main/main.cpp b/main/main.cpp index 884caab1e9..9c8909f8fb 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1744,6 +1744,19 @@ Error Main::setup2(Thread::ID p_main_tid_override) { register_scene_types(); +#ifdef TOOLS_ENABLED + ClassDB::set_current_api(ClassDB::API_EDITOR); + EditorNode::register_editor_types(); + + ClassDB::set_current_api(ClassDB::API_CORE); + +#endif + + MAIN_PRINT("Main: Load Modules, Physics, Drivers, Scripts"); + + register_platform_apis(); + register_module_types(); + GLOBAL_DEF("display/mouse_cursor/custom_image", String()); GLOBAL_DEF("display/mouse_cursor/custom_image_hotspot", Vector2()); GLOBAL_DEF("display/mouse_cursor/tooltip_position_offset", Point2(10, 10)); @@ -1760,18 +1773,6 @@ Error Main::setup2(Thread::ID p_main_tid_override) { Input::get_singleton()->set_custom_mouse_cursor(cursor, Input::CURSOR_ARROW, hotspot); } } -#ifdef TOOLS_ENABLED - ClassDB::set_current_api(ClassDB::API_EDITOR); - EditorNode::register_editor_types(); - - ClassDB::set_current_api(ClassDB::API_CORE); - -#endif - - MAIN_PRINT("Main: Load Modules, Physics, Drivers, Scripts"); - - register_platform_apis(); - register_module_types(); camera_server = CameraServer::create(); |