|
@@ -1847,10 +1847,8 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
|
|
|
|
|
|
} else if (m->get_button_mask() & BUTTON_MASK_MIDDLE) {
|
|
|
|
|
|
+ const int mod = _get_key_modifier(m);
|
|
|
if (nav_scheme == NAVIGATION_GODOT) {
|
|
|
-
|
|
|
- const int mod = _get_key_modifier(m);
|
|
|
-
|
|
|
if (mod == _get_key_modifier_setting("editors/3d/navigation/pan_modifier")) {
|
|
|
nav_mode = NAVIGATION_PAN;
|
|
|
} else if (mod == _get_key_modifier_setting("editors/3d/navigation/zoom_modifier")) {
|
|
@@ -1861,8 +1859,9 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) {
|
|
|
}
|
|
|
|
|
|
} else if (nav_scheme == NAVIGATION_MAYA) {
|
|
|
- if (m->get_alt())
|
|
|
+ if (mod == _get_key_modifier_setting("editors/3d/navigation/pan_modifier")) {
|
|
|
nav_mode = NAVIGATION_PAN;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
} else if (EditorSettings::get_singleton()->get("editors/3d/navigation/emulate_3_button_mouse")) {
|