diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-02-18 19:37:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-18 19:37:28 +0100 |
| commit | 7eb4e6415d74e3d4dae6ddd12bb0bdb7acf221c0 (patch) | |
| tree | eb3468f199205840a967b895593d5026f5e11b5f /main/main.cpp | |
| parent | 5c2fe970b87f8e95306bad0f713567a150b1e442 (diff) | |
| parent | 49714b09635fddb3dbada703017482e732a4b459 (diff) | |
Merge pull request #43663 from EricEzaM/PR/INP4-dehardcode_scene_shortcuts
Remove hardcoded shortcuts from /scene and instead use the input action system to allow them to be customised.
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp index f068c39b58..0970f81ff1 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -515,8 +515,8 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph MAIN_PRINT("Main: Initialize Globals"); - globals = memnew(ProjectSettings); input_map = memnew(InputMap); + globals = memnew(ProjectSettings); register_core_settings(); //here globals is present |