diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-19 19:30:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-19 19:30:57 +0200 |
| commit | 1abfd61f6ea125032d277d90b004841b877be3b7 (patch) | |
| tree | 741a3720bde047139922847ce6015545772c4729 /modules/gridmap | |
| parent | d8477c0596b2ce6669c92e2f4581a9a7aaf92798 (diff) | |
| parent | 7b1e112f1ddecfa8c7558d2958bc7ad44ad28c56 (diff) | |
Merge pull request #28295 from zqyoung1/fix-gridmap-nav-schemes
Fixed navigation schemes Modo/Maya when used with grid map tile place…
Diffstat (limited to 'modules/gridmap')
| -rw-r--r-- | modules/gridmap/grid_map_editor_plugin.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/gridmap/grid_map_editor_plugin.cpp b/modules/gridmap/grid_map_editor_plugin.cpp index 890bd730f7..6b9a97efb4 100644 --- a/modules/gridmap/grid_map_editor_plugin.cpp +++ b/modules/gridmap/grid_map_editor_plugin.cpp @@ -664,8 +664,10 @@ bool GridMapEditor::forward_spatial_input_event(Camera *p_camera, const Ref<Inpu } if (mb->is_pressed()) { - - if (mb->get_button_index() == BUTTON_LEFT) { + SpatialEditorViewport::NavigationScheme nav_scheme = (SpatialEditorViewport::NavigationScheme)EditorSettings::get_singleton()->get("editors/3d/navigation/navigation_scheme").operator int(); + if ((nav_scheme == SpatialEditorViewport::NAVIGATION_MAYA || nav_scheme == SpatialEditorViewport::NAVIGATION_MODO) && mb->get_alt()) { + input_action = INPUT_NONE; + } else if (mb->get_button_index() == BUTTON_LEFT) { if (input_action == INPUT_PASTE) { _do_paste(); |