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

Merge pull request #42979 from Mallos/fix/tilemap-floodfill

Browse Source 
fix(editor): TileMap floodfill with same tile ID and different variation
This commit is contained in:
Rémi Verschelde 2020-11-02 17:05:43 +01:00 committed by GitHub
commit be14d9d644
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 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

@ -651,9 +651,15 @@ Vector<Vector2> TileMapEditor::_bucket_fill(const Point2i &p_start, bool erase,
return Vector<Vector2>();
}
// 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) {
// Same ID, nothing to change
return Vector<Vector2>();
int current = manual_palette->get_current();
Vector2 position = manual_palette->get_item_metadata(current);
if (prev_position == position) {
// Same ID and variation, nothing to change
return Vector<Vector2>();
}
}
Rect2i r = node->get_used_rect();