Avoid unnecessary alloc

stride3d · Jul 18, 2019 · 2612f98 · 2612f98
1 parent caa44fe
commit 2612f98
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/sources/engine/Xenko.Engine/Engine/SceneInstance.cs b/sources/engine/Xenko.Engine/Engine/SceneInstance.cs
@@ -148,15 +148,21 @@ private void Remove(Scene scene)
             scene.Entities.CollectionChanged -= Entities_CollectionChanged;
             scene.Children.CollectionChanged -= Children_CollectionChanged;
 
-            var scenesToRemove = new Scene[scene.Children.Count];
-            scene.Children.CopyTo(scenesToRemove, 0);
-            foreach (var childScene in scenesToRemove)
-                Remove(childScene);
-
-            var entitiesToRemove = new Entity[scene.Entities.Count];
-            scene.Entities.CopyTo(entitiesToRemove, 0);
-            foreach (var entity in entitiesToRemove)
-                Remove(entity);
+            if (scene.Children.Count > 0)
+            {
+                var scenesToRemove = new Scene[scene.Children.Count];
+                scene.Children.CopyTo(scenesToRemove, 0);
+                foreach (var childScene in scenesToRemove)
+                    Remove(childScene);
+            }
+
+            if (scene.Entities.Count > 0)
+            {
+                var entitiesToRemove = new Entity[scene.Entities.Count];
+                scene.Entities.CopyTo(entitiesToRemove, 0);
+                foreach (var entity in entitiesToRemove)
+                    Remove(entity);
+            }
         }
 
         private void Entities_CollectionChanged(object sender, TrackingCollectionChangedEventArgs e)