godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-24 15:26:15 +00:00
Code Releases Wiki Activity

Merge pull request #43661 from EricEzaM/PR/INP2-rename_load_from_globals

Browse Source 
load_from_globals() -> load_from_project_settings()
This commit is contained in:
Rémi Verschelde
2020-11-19 07:40:21 +01:00
committed by GitHub
parent eebd3e8aa1 e5376fb129
commit 2ca1c17a5c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/main.cpp
View File

@@ -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"))) {