SerializedScene improvements

Author: arimger

Assets/Editor Toolbox/Editor/Drawers/Regular/SerializedSceneDrawer.cs

@@ -10,10 +10,10 @@ public class SerializedSceneDrawer : PropertyDrawerBase
         private bool HasSceneDetails(SerializedProperty property)
         {
             var sceneProperty = property.FindPropertyRelative("sceneReference");
-            return attribute != null && sceneProperty.objectReferenceValue;
+            return attribute != null && attribute is SceneDetailsAttribute && sceneProperty.objectReferenceValue;
         }
 
-        private void DrawIncludedSceneDetails(Rect position, SceneData sceneData)
+        private void DrawSceneDetails(Rect position, SceneData sceneData)
         {
             EditorGUI.BeginDisabledGroup(true);
             var spacing = EditorGUIUtility.standardVerticalSpacing;
@@ -23,19 +23,6 @@ private void DrawIncludedSceneDetails(Rect position, SceneData sceneData)
             EditorGUI.EndDisabledGroup();
         }
 
-        private void DrawRejectedSceneDetails(Rect position, SceneData sceneData)
-        {
-            EditorGUI.BeginDisabledGroup(true);
-            var spacing = EditorGUIUtility.standardVerticalSpacing;
-            EditorGUI.LabelField(position, Style.notInBuildContent);
-            position.y += EditorGUIUtility.singleLineHeight + spacing;
-            EditorGUI.EndDisabledGroup();
-            if (GUI.Button(position, Style.showDetailsContent))
-            {
-                OpenBuildSettings();
-            }
-        }
-
         private void OpenBuildSettings()
         {
             EditorWindow.GetWindow(typeof(BuildPlayerWindow));
@@ -69,11 +56,18 @@ protected override void OnGUISafe(Rect position, SerializedProperty property, GU
             position.y += EditorGUIUtility.singleLineHeight + spacing;
             if (sceneData.inBuild)
             {
-                DrawIncludedSceneDetails(position, sceneData);
+                DrawSceneDetails(position, sceneData);
             }
             else
             {
-                DrawRejectedSceneDetails(position, sceneData);
+                EditorGUI.BeginDisabledGroup(true);
+                EditorGUI.LabelField(position, Style.notInBuildContent);
+                position.y += EditorGUIUtility.singleLineHeight + spacing;
+                EditorGUI.EndDisabledGroup();
+                if (GUI.Button(position, Style.showDetailsContent))
+                {
+                    OpenBuildSettings();
+                }
             }
         }
 

Assets/Editor Toolbox/Runtime/Serialization/SceneSerializationUtility.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+
 #if UNITY_EDITOR
 using UnityEditor;
 #endif
@@ -42,12 +43,8 @@ private static void RefreshCache()
             var buildIndex = -1;
             foreach (var scene in EditorBuildSettings.scenes)
             {
-                if (!scene.enabled)
-                {
-                    continue;
-                }
-
                 buildIndex++;
+                var sceneIndex = scene.enabled ? buildIndex : InvalidSceneIndex;
                 var sceneAsset = EditorGUIUtility.Load(scene.path) as SceneAsset;
                 if (sceneAsset != null)
                 {
@@ -74,5 +71,8 @@ public static bool TryGetSceneData(SceneAsset sceneAsset, out SceneData data)
             return true;
         }
 #endif
+
+
+        public static int InvalidSceneIndex => -1;
     }
 }

Assets/Editor Toolbox/Runtime/Serialization/SerializedScene.cs

@@ -78,5 +78,13 @@ public int BuildIndex
             get => buildIndex;
             set => buildIndex = value;
         }
+
+        /// <summary>
+        /// Indicates if serialized <see cref="BuildIndex"/> has appropriate value and can be loaded in runtime.
+        /// </summary>
+        public bool CanBeLoaded
+        {
+            get => BuildIndex != SceneSerializationUtility.InvalidSceneIndex;
+        }
     }
 }