diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-01 11:35:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-01 11:35:39 +0100 |
| commit | 5aa96b72c7a379d5b869168933153ffb0820f125 (patch) | |
| tree | 600c93e1ef2fd16c9b7e067a08c0bf033be64087 | |
| parent | a4936e500f4af10d8900d6595dc63bd4246fff09 (diff) | |
| parent | bf143c05d251005a9b68654892e41ce1fe6b21cf (diff) | |
Merge pull request #34706 from KoBeWi/grindput
Don't handle Gridmap input when have no effect
| -rw-r--r-- | modules/gridmap/grid_map_editor_plugin.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/gridmap/grid_map_editor_plugin.cpp b/modules/gridmap/grid_map_editor_plugin.cpp index 1695cd5d54..4aa407f966 100644 --- a/modules/gridmap/grid_map_editor_plugin.cpp +++ b/modules/gridmap/grid_map_editor_plugin.cpp @@ -664,14 +664,15 @@ bool GridMapEditor::forward_spatial_input_event(Camera *p_camera, const Ref<Inpu input_action = INPUT_NONE; } else if (mb->get_button_index() == BUTTON_LEFT) { + bool can_edit = (node && node->get_mesh_library().is_valid()); if (input_action == INPUT_PASTE) { _do_paste(); input_action = INPUT_NONE; _update_paste_indicator(); - } else if (mb->get_shift()) { + } else if (mb->get_shift() && can_edit) { input_action = INPUT_SELECT; last_selection = selection; - } else if (mb->get_command()) { + } else if (mb->get_command() && can_edit) { input_action = INPUT_PICK; } else { input_action = INPUT_PAINT; |