Merge pull request godotengine#93747 from KoBeWi/layer_of_bugs

akien-mga · akien-mga · commit 4ab8fb809396 · 2024-06-29T19:54:30.000+02:00
Fix some TileMapLayer editing problems
diff --git 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
@@ -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
 

Original file line number	Diff line number	Diff line change
`@@ -763,9 +763,13 @@ bool TileMapLayerEditorTilesPlugin::forward_canvas_gui_input(const Ref<InputEven`
`763`	`763`	`}`
`764`	`764`
`765`	`765`	`} else {`
`766`		`- // Released`
`767`		`- _stop_dragging();`
	`766`	`+ // Released.`
`768`	`767`	`drag_erasing = false;`
	`768`	`+ if (drag_type == DRAG_TYPE_NONE) {`
	`769`	`+ return false;`
	`770`	`+ } else {`
	`771`	`+ _stop_dragging();`
	`772`	`+ }`
`769`	`773`	`}`
`770`	`774`
`771`	`775`	`CanvasItemEditor::get_singleton()->update_viewport();`
Original file line number	Diff line number	Diff line change
`@@ -1889,7 +1889,7 @@ void TileMapLayer::_update_self_texture_repeat(RS::CanvasItemTextureRepeat p_tex`
`1889`	`1889`
`1890`	`1890`	`#ifdef TOOLS_ENABLED`
`1891`	`1891`	`bool TileMapLayer::_edit_is_selected_on_click(const Point2 &p_point, double p_tolerance) const {`
`1892`		`- return get_cell_source_id(local_to_map(p_point)) != TileSet::INVALID_SOURCE;`
	`1892`	`+ return tile_set.is_valid() && get_cell_source_id(local_to_map(p_point)) != TileSet::INVALID_SOURCE;`
`1893`	`1893`	`}`
`1894`	`1894`	`#endif`
`1895`	`1895`