diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-06-05 01:19:42 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-06-05 01:19:42 -0300 |
| commit | 64fd75d91a65d6fe05cf6c3578f53f85b4c92c27 (patch) | |
| tree | 2166e92e2b8f00e83026ebf59563d514bf6f806f /main/main.cpp | |
| parent | cee94b61199163ad3c03e240fad5b164958687ff (diff) | |
| download | redot-engine-64fd75d91a65d6fe05cf6c3578f53f85b4c92c27.tar.gz | |
Make Input Actions config not affect the editor
Diffstat (limited to 'main/main.cpp')
| -rw-r--r-- | main/main.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp index fba7a781bf..2e30ed298a 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -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))); |