From 682d546d60d7ae89c2b8d3c3443b1341760cfcc2 Mon Sep 17 00:00:00 2001 From: Robert Yevdokimov <105675984+ryevdokimov@users.noreply.github.com> Date: Thu, 22 Jan 2026 19:32:06 -0500 Subject: [PATCH] Change orbit snap shortcut with navigation scheme (cherry picked from commit 1dec165139924a7b0108b93e85acace506b8a7e0) --- editor/settings/editor_settings_dialog.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/editor/settings/editor_settings_dialog.cpp b/editor/settings/editor_settings_dialog.cpp index ca7c740d17..ecd014526c 100644 --- a/editor/settings/editor_settings_dialog.cpp +++ b/editor/settings/editor_settings_dialog.cpp @@ -98,6 +98,8 @@ void EditorSettingsDialog::update_navigation_preset() { Ref pan_mod_key_2; Ref zoom_mod_key_1; Ref zoom_mod_key_2; + Ref orbit_snap_mod_key_1; + Ref orbit_snap_mod_key_2; bool set_preset = false; if (nav_scheme == Node3DEditorViewport::NAVIGATION_GODOT) { @@ -112,6 +114,8 @@ void EditorSettingsDialog::update_navigation_preset() { pan_mod_key_2 = InputEventKey::create_reference(Key::NONE); zoom_mod_key_1 = InputEventKey::create_reference(Key::CTRL); zoom_mod_key_2 = InputEventKey::create_reference(Key::NONE); + orbit_snap_mod_key_1 = InputEventKey::create_reference(Key::ALT); + orbit_snap_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; @@ -124,6 +128,8 @@ void EditorSettingsDialog::update_navigation_preset() { pan_mod_key_2 = InputEventKey::create_reference(Key::NONE); zoom_mod_key_1 = InputEventKey::create_reference(Key::ALT); zoom_mod_key_2 = InputEventKey::create_reference(Key::NONE); + orbit_snap_mod_key_1 = InputEventKey::create_reference(Key::NONE); + orbit_snap_mod_key_2 = InputEventKey::create_reference(Key::NONE); } else if (nav_scheme == Node3DEditorViewport::NAVIGATION_MODO) { set_preset = true; set_orbit_mouse_button = Node3DEditorViewport::NAVIGATION_LEFT_MOUSE; @@ -136,6 +142,8 @@ void EditorSettingsDialog::update_navigation_preset() { pan_mod_key_2 = InputEventKey::create_reference(Key::ALT); zoom_mod_key_1 = InputEventKey::create_reference(Key::ALT); zoom_mod_key_2 = InputEventKey::create_reference(Key::CTRL); + orbit_snap_mod_key_1 = InputEventKey::create_reference(Key::NONE); + orbit_snap_mod_key_2 = InputEventKey::create_reference(Key::NONE); } else if (nav_scheme == Node3DEditorViewport::NAVIGATION_TABLET) { set_preset = true; set_orbit_mouse_button = Node3DEditorViewport::NAVIGATION_MIDDLE_MOUSE; @@ -148,6 +156,8 @@ void EditorSettingsDialog::update_navigation_preset() { pan_mod_key_2 = InputEventKey::create_reference(Key::NONE); zoom_mod_key_1 = InputEventKey::create_reference(Key::CTRL); zoom_mod_key_2 = InputEventKey::create_reference(Key::NONE); + orbit_snap_mod_key_1 = InputEventKey::create_reference(Key::NONE); + orbit_snap_mod_key_2 = InputEventKey::create_reference(Key::NONE); } // Set settings to the desired preset values. if (set_preset) { @@ -161,6 +171,8 @@ void EditorSettingsDialog::update_navigation_preset() { _set_shortcut_input("spatial_editor/viewport_pan_modifier_2", pan_mod_key_2); _set_shortcut_input("spatial_editor/viewport_zoom_modifier_1", zoom_mod_key_1); _set_shortcut_input("spatial_editor/viewport_zoom_modifier_2", zoom_mod_key_2); + _set_shortcut_input("spatial_editor/viewport_orbit_snap_modifier_1", orbit_snap_mod_key_1); + _set_shortcut_input("spatial_editor/viewport_orbit_snap_modifier_2", orbit_snap_mod_key_2); } }