summaryrefslogtreecommitdiffstats
path: root/editor
diff options
context:
space:
mode:
authorThaddeus Crews <repiteo@outlook.com>2024-11-12 12:13:05 -0600
committerThaddeus Crews <repiteo@outlook.com>2024-11-12 12:13:05 -0600
commit9309b37228dc3f87e5ef8a461396273f2ffc4bc5 (patch)
tree57e6b75be56bdbcb65e0e75f9a0e4a14d369fb1f /editor
parentcc6ee3e956309de046dc1ed09b2f38a5ec7a76c7 (diff)
parent22b220b6a46baa6891db1cc642be4b2a4ef9663a (diff)
downloadredot-engine-9309b37228dc3f87e5ef8a461396273f2ffc4bc5.tar.gz
Merge pull request #97955 from RobProductions/fix-godot-nav-preset
Restore the original `Godot` preset zoom modifier
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_settings_dialog.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/editor_settings_dialog.cpp b/editor/editor_settings_dialog.cpp
index d6742c9b55..8989b9cf9b 100644
--- a/editor/editor_settings_dialog.cpp
+++ b/editor/editor_settings_dialog.cpp
@@ -106,8 +106,8 @@ void EditorSettingsDialog::update_navigation_preset() {
orbit_mod_key_2 = InputEventKey::create_reference(Key::NONE);
pan_mod_key_1 = InputEventKey::create_reference(Key::SHIFT);
pan_mod_key_2 = InputEventKey::create_reference(Key::NONE);
- zoom_mod_key_1 = InputEventKey::create_reference(Key::SHIFT);
- zoom_mod_key_2 = InputEventKey::create_reference(Key::CTRL);
+ zoom_mod_key_1 = InputEventKey::create_reference(Key::CTRL);
+ zoom_mod_key_2 = InputEventKey::create_reference(Key::NONE);
} else if (nav_scheme == Node3DEditorViewport::NAVIGATION_MAYA) {
set_preset = true;
set_orbit_mouse_button = Node3DEditorViewport::NAVIGATION_LEFT_MOUSE;