瀏覽代碼

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

Disable loop with CompatibilityTileData in TileSet when building with deprecated=no
Rémi Verschelde 4 年之前
父節點
當前提交
144759303d
共有 1 個文件被更改,包括 2 次插入0 次删除
  1. 2 0
      scene/resources/tile_set.cpp

+ 2 - 0
scene/resources/tile_set.cpp

@@ -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]);
 	}
 	}