godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TileMapEditor::_bucket_fill Check autotile coordinates only if autotile is selected

This commit is contained in:
kleonc 2021-05-03 14:49:52 +02:00
parent 015fc2ad4f
commit a1b903066e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editor/plugins/tile_map_editor_plugin.cpp
View File

@ -658,11 +658,15 @@ Vector<Vector2> TileMapEditor::_bucket_fill(const Point2i &p_start, bool erase,
} }
// Check if the tile variation is the same // Check if the tile variation is the same
Vector2 prev_position = node->get_cell_autotile_coord(p_start.x, p_start.y);
if (ids.size() == 1 && ids[0] == prev_id) { if (ids.size() == 1 && ids[0] == prev_id) {
int current = manual_palette->get_current(); int current = manual_palette->get_current();
Vector2 position = manual_palette->get_item_metadata(current); if (current == -1) {
if (prev_position == position) { // Same ID, no variation selected, nothing to change
return Vector<Vector2>();
}
Vector2 prev_autotile_coord = node->get_cell_autotile_coord(p_start.x, p_start.y);
Vector2 autotile_coord = manual_palette->get_item_metadata(current);
if (autotile_coord == prev_autotile_coord) {
// Same ID and variation, nothing to change // Same ID and variation, nothing to change
return Vector<Vector2>(); return Vector<Vector2>();
} }