From 5b415e398abde534f2d668ab8467c60016ca8aa6 Mon Sep 17 00:00:00 2001
From: Bruno Mikoski <badawe@gmail.com>
Date: Sun, 7 Nov 2021 09:23:21 +0000
Subject: [PATCH] add: check for hidden objects

---
 Scripts/Editor/SceneStateKeeper.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Scripts/Editor/SceneStateKeeper.cs b/Scripts/Editor/SceneStateKeeper.cs
index 0829b4e..8b50d44 100644
--- 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;
             }