summaryrefslogtreecommitdiff
path: root/core/project_settings.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-08-06 21:04:11 -0300
committerGitHub <noreply@github.com>2017-08-06 21:04:11 -0300
commit134b3edf5a34eb05322f064a9194c0ea81c39f6c (patch)
treefc84a3e15c7ae3f8c8ea162a1ffb9f1471890956 /core/project_settings.cpp
parent85945e4367c6c0759f855a3dfefe5941c3c07cd3 (diff)
parent7b7c7c8dc0e3572a7d66d274b3e4db43695ce814 (diff)
Merge pull request #10123 from bojidar-bg/7695-key-kp-enter
Rename KEY_RETURN to KEY_ENTER and KEY_ENTER to KEY_KP_ENTER
Diffstat (limited to 'core/project_settings.cpp')
-rw-r--r--core/project_settings.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/project_settings.cpp b/core/project_settings.cpp
index b31f78ec20..f6e0d2e991 100644
--- a/core/project_settings.cpp
+++ b/core/project_settings.cpp
@@ -925,10 +925,10 @@ ProjectSettings::ProjectSettings() {
GLOBAL_DEF("application/config/use_shared_user_dir", true);
key.instance();
- key->set_scancode(KEY_RETURN);
+ key->set_scancode(KEY_ENTER);
va.push_back(key);
key.instance();
- key->set_scancode(KEY_ENTER);
+ key->set_scancode(KEY_KP_ENTER);
va.push_back(key);
key.instance();
key->set_scancode(KEY_SPACE);