diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-05-31 14:26:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-31 14:26:13 +0200 |
| commit | 144759303de27ea2d5f73edd6965cc6b0d5b0fe3 (patch) | |
| tree | 63a758e250b44acd085217b2763cfebf054c2c7b /scene | |
| parent | c9ce5367e3d35074193eb3999d9e2f9cbb8576c6 (diff) | |
| parent | dbb5c036c43f6e2d266c10d78782cdddd589d382 (diff) | |
Merge pull request #49208 from aaronfranke/tileset-disable-dep-compat
Disable loop with CompatibilityTileData in TileSet when building with deprecated=no
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/resources/tile_set.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scene/resources/tile_set.cpp b/scene/resources/tile_set.cpp index 308f219a8d..59c1a4e915 100644 --- a/scene/resources/tile_set.cpp +++ b/scene/resources/tile_set.cpp @@ -1407,9 +1407,11 @@ TileSet::TileSet() { } TileSet::~TileSet() { +#ifndef DISABLE_DEPRECATED for (Map<int, CompatibilityTileData *>::Element *E = compatibility_data.front(); E; E = E->next()) { memdelete(E->get()); } +#endif // DISABLE_DEPRECATED while (!source_ids.is_empty()) { remove_source(source_ids[0]); } |