diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-03-13 22:03:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-13 22:03:40 +0100 |
| commit | 223a06955e6c52ba280469604a5086a2b3af7f25 (patch) | |
| tree | 12443f57c0c5641311bceeb04dda2cca9f8deb13 /editor/plugins | |
| parent | 7015027cbf6ee071198267b6f4ffc3f4e40dfdd5 (diff) | |
| parent | 31077d875ea9f778d960d9bdfbc6affbab54081a (diff) | |
Merge pull request #46978 from jmb462/fix-hardcoded-maya-style-pan-key-modifier
Fix hardcoded Maya style navigation pan key modifier (Fix #46973)
Diffstat (limited to 'editor/plugins')
| -rw-r--r-- | editor/plugins/node_3d_editor_plugin.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp index 9643881f96..1d08a7821d 100644 --- a/editor/plugins/node_3d_editor_plugin.cpp +++ b/editor/plugins/node_3d_editor_plugin.cpp @@ -1841,9 +1841,8 @@ void Node3DEditorViewport::_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")) { @@ -1854,7 +1853,7 @@ void Node3DEditorViewport::_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; } } |