diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-19 07:40:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-19 07:40:21 +0100 |
| commit | 2ca1c17a5cfd681a4fdb72c3c9fccb77792ae0b0 (patch) | |
| tree | e16081f2ae8c8f8dd9aae9d8dfe9e306a030141b /main | |
| parent | eebd3e8aa12fa53b473f389493323869a8fba9c0 (diff) | |
| parent | e5376fb129db2149eebe413dbf9bb69baf4834f2 (diff) | |
| download | redot-engine-2ca1c17a5cfd681a4fdb72c3c9fccb77792ae0b0.tar.gz | |
Merge pull request #43661 from EricEzaM/PR/INP2-rename_load_from_globals
load_from_globals() -> load_from_project_settings()
Diffstat (limited to 'main')
| -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 09f16e9d75..82be327cbb 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1143,7 +1143,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph use_custom_res = false; input_map->load_default(); //keys for editor } else { - input_map->load_from_globals(); //keys for game + input_map->load_from_project_settings(); //keys for game } if (bool(ProjectSettings::get_singleton()->get("application/run/disable_stdout"))) { |