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

Merge pull request #49208 from aaronfranke/tileset-disable-dep-compat 

Disable loop with CompatibilityTileData in TileSet when building with deprecated=no
This commit is contained in:
Rémi Verschelde 2021-05-31 14:26:13 +02:00 committed by GitHub
parent c9ce5367e3 dbb5c036c4
commit 144759303d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/resources/tile_set.cpp
View File

@ -1407,9 +1407,11 @@ TileSet::TileSet() {
} }
TileSet::~TileSet() { TileSet::~TileSet() {
#ifndef DISABLE_DEPRECATED
for (Map<int, CompatibilityTileData *>::Element *E = compatibility_data.front(); E; E = E->next()) { for (Map<int, CompatibilityTileData *>::Element *E = compatibility_data.front(); E; E = E->next()) {
memdelete(E->get()); memdelete(E->get());
} }
#endif // DISABLE_DEPRECATED
while (!source_ids.is_empty()) { while (!source_ids.is_empty()) {
remove_source(source_ids[0]); remove_source(source_ids[0]);
} }