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

Merge pull request #79851 from timothyqiu/null-tileset 

Fix crash when executing `TileMap.fix_invalid_tiles`
This commit is contained in:
Yuri Sizov 2023-07-24 19:33:55 +02:00
parent 21524e26e0 a7ab7e469b
commit f6187014ec
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/2d/tile_map.cpp
View File

@ -2273,9 +2273,12 @@ void TileMapLayer::force_update() {
} }
void TileMapLayer::fix_invalid_tiles() { void TileMapLayer::fix_invalid_tiles() {
Ref<TileSet> tileset = tile_map_node->get_tileset();
ERR_FAIL_COND_MSG(tileset.is_null(), "Cannot call fix_invalid_tiles() on a TileMap without a valid TileSet.");
RBSet<Vector2i> coords; RBSet<Vector2i> coords;
for (const KeyValue<Vector2i, TileMapCell> &E : tile_map) { for (const KeyValue<Vector2i, TileMapCell> &E : tile_map) {
TileSetSource *source = *(tile_map_node->get_tileset())->get_source(E.value.source_id); TileSetSource *source = *tileset->get_source(E.value.source_id);
if (!source || !source->has_tile(E.value.get_atlas_coords()) || !source->has_alternative_tile(E.value.get_atlas_coords(), E.value.alternative_tile)) { if (!source || !source->has_tile(E.value.get_atlas_coords()) || !source->has_alternative_tile(E.value.get_atlas_coords(), E.value.alternative_tile)) {
coords.insert(E.key); coords.insert(E.key);
} }