diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-29 19:54:30 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-06-29 19:54:30 +0200 |
| commit | 4ab8fb809396fa38ba929fec97cfcb7193f1c44d (patch) | |
| tree | ad876b692da8d522e6a3a6eb7984ac27e8caaed6 | |
| parent | 2f7973f04bb4fbbad256d5427154d5d3f34de59e (diff) | |
| parent | 92b0375785e1b4defa8a0a00b509f5c72264e15b (diff) | |
| download | redot-engine-4ab8fb809396fa38ba929fec97cfcb7193f1c44d.tar.gz | |
Merge pull request #93747 from KoBeWi/layer_of_bugs
Fix some TileMapLayer editing problems
| -rw-r--r-- | editor/plugins/tiles/tile_map_layer_editor.cpp | 8 | ||||
| -rw-r--r-- | scene/2d/tile_map_layer.cpp | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/editor/plugins/tiles/tile_map_layer_editor.cpp b/editor/plugins/tiles/tile_map_layer_editor.cpp index 41b8b88f73..f6e4c6f951 100644 --- a/editor/plugins/tiles/tile_map_layer_editor.cpp +++ b/editor/plugins/tiles/tile_map_layer_editor.cpp @@ -763,9 +763,13 @@ bool TileMapLayerEditorTilesPlugin::forward_canvas_gui_input(const Ref<InputEven } } else { - // Released - _stop_dragging(); + // Released. drag_erasing = false; + if (drag_type == DRAG_TYPE_NONE) { + return false; + } else { + _stop_dragging(); + } } CanvasItemEditor::get_singleton()->update_viewport(); diff --git a/scene/2d/tile_map_layer.cpp b/scene/2d/tile_map_layer.cpp index 171ff7f039..437790bb99 100644 --- a/scene/2d/tile_map_layer.cpp +++ b/scene/2d/tile_map_layer.cpp @@ -1889,7 +1889,7 @@ void TileMapLayer::_update_self_texture_repeat(RS::CanvasItemTextureRepeat p_tex #ifdef TOOLS_ENABLED bool TileMapLayer::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const { - return get_cell_source_id(local_to_map(p_point)) != TileSet::INVALID_SOURCE; + return tile_set.is_valid() && get_cell_source_id(local_to_map(p_point)) != TileSet::INVALID_SOURCE; } #endif |