diff options
| author | Gilles Roudière <gilles.roudiere@gmail.com> | 2021-11-29 21:33:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-29 21:33:55 +0100 |
| commit | aa74494ab965489d0f81f4a170083acb3fb9571d (patch) | |
| tree | ec0c2eb8dbf98d240a4cac2cb88997489e5c0015 /editor/plugins/tiles/tile_map_editor.cpp | |
| parent | 9d3875dde75b95ea172c60188ca345162f2b38b9 (diff) | |
| parent | 61c2d397d61b4193e7033eddb449344310d6d97c (diff) | |
Merge pull request #55445 from fazil47/master
Right-clicking with copied tiles cancels it
Diffstat (limited to 'editor/plugins/tiles/tile_map_editor.cpp')
| -rw-r--r-- | editor/plugins/tiles/tile_map_editor.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/editor/plugins/tiles/tile_map_editor.cpp b/editor/plugins/tiles/tile_map_editor.cpp index 73b1fc7c67..37d52174f9 100644 --- a/editor/plugins/tiles/tile_map_editor.cpp +++ b/editor/plugins/tiles/tile_map_editor.cpp @@ -598,7 +598,10 @@ bool TileMapEditorTilesPlugin::forward_canvas_gui_input(const Ref<InputEvent> &p } if (drag_type == DRAG_TYPE_CLIPBOARD_PASTE) { - // Do nothing. + // Cancel tile pasting on right-click + if (mb->get_button_index() == MouseButton::RIGHT) { + drag_type = DRAG_TYPE_NONE; + } } else if (tool_buttons_group->get_pressed_button() == select_tool_button) { drag_start_mouse_pos = mpos; if (tile_map_selection.has(tile_map->world_to_map(drag_start_mouse_pos)) && !mb->is_shift_pressed()) { |