add: check for hidden objects

brunomikoski · Nov 7, 2021 · 5b415e3 · 5b415e3
1 parent 0e06aca
commit 5b415e3
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/Scripts/Editor/SceneStateKeeper.cs b/Scripts/Editor/SceneStateKeeper.cs
@@ -255,6 +255,11 @@ private static void StoreHierarchyData(Scene targetScene, ref HashSet<GameObject
                 if (targetObj == null)
                     continue;
 
+                if (targetObj.hideFlags.HasFlag(HideFlags.HideInHierarchy)
+                    || targetObj.hideFlags.HasFlag(HideFlags.NotEditable)
+                    || targetObj.hideFlags.HasFlag(HideFlags.HideAndDontSave))
+                    continue;
+
                 if (targetObj is GameObject gameObject)
                 {
                     if (alreadySelectedGameObjects.Contains(gameObject))
@@ -399,7 +404,11 @@ public static bool IsObjectsExpanded(params GameObject[] gameObjects)
         {
             for (int i = 0; i < gameObjects.Length; i++)
             {
-                if (!SceneData.alwaysExpanded.Contains(gameObjects[i].transform.GetPath()))
+                GameObject gameObject = gameObjects[i];
+                if (gameObject == null)
+                    continue;
+
+                if (!SceneData.alwaysExpanded.Contains(gameObject.transform.GetPath()))
                     return false;
             }