Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-08 06:09:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make Input Actions config not affect the editor

Browse source
This commit is contained in:
Juan Linietsky 2016-06-05 01:19:42 -03:00
parent cee94b6119
commit 64fd75d91a
3 changed files with 67 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
main/main.cpp
View file

@ -688,7 +688,10 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
#endif
input_map->load_from_globals();
if (editor)
input_map->load_default(); //keys for editor
else
input_map->load_from_globals(); //keys for game
if (video_driver=="") // specified in engine.cfg
video_driver=_GLOBAL_DEF("display/driver",Variant((const char*)OS::get_singleton()->get_video_driver_name(0)));