summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorEric M <itsjusteza@gmail.com>2020-12-07 21:31:51 +1000
committerEric M <itsjusteza@gmail.com>2021-02-18 16:22:50 +0100
commit074f53563d6955dfddaf7d7b4b787664af2c29a7 (patch)
tree89528e45a67f4d8949a51c175ffc6fd6b8f4035a /main
parentca1abc7352ed3d8e9ca82eb4838777270f7c27a9 (diff)
Added ability to override built-in actions for the editor
This adds the ability to add overrides for built-in actions (i.e. ui_*) in the editor. Also added a number of additional built-in actions for various text-related actions, gui-generic actions (like copy and paste) and graph-related actions (duplicate nodes), etc. Moved the definition of input actions to input_map, rather than in project_settings so the editor can make use of these actions as well.
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp
index f068c39b58..0970f81ff1 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -515,8 +515,8 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
MAIN_PRINT("Main: Initialize Globals");
- globals = memnew(ProjectSettings);
input_map = memnew(InputMap);
+ globals = memnew(ProjectSettings);
register_core_settings(); //here globals is present