Unity 2023.2.0a11 C# reference source code

Author: Unity Technologies

Editor/Mono/BuildPlayerWindow.cs

@@ -239,6 +239,10 @@ void AddOpenScenes()
             for (int i = 0; i < SceneManager.sceneCount; i++)
             {
                 Scene scene = SceneManager.GetSceneAt(i);
+
+                if (EditorSceneManager.IsAuthoringScene(scene))
+                    continue;
+
                 if (scene.path.Length == 0 && !EditorSceneManager.SaveScene(scene, "", false))
                     continue;
 

Editor/Mono/ConsoleWindow.cs

@@ -156,7 +156,7 @@ internal static void UpdateLogStyleFixedHeights()
         ListViewState m_ListView;
         string m_ActiveText = "";
         StringBuilder m_CopyString;
-        private int m_LastPingedEntry = -1;
+        private int m_LastPingedEntryRow = -1;
         bool m_DevBuild;
         int m_CallstackTextStart = 0;
         private Mode m_ActiveMode = Mode.None;
@@ -453,18 +453,19 @@ void SetActiveEntry(LogEntry entry)
                 m_ActiveMode = (Mode)entry.mode;
                 entry.callstackTextStartUTF8 = entry.message.Length;
                 m_CallstackTextStart = entry.callstackTextStartUTF16;
+                var entryRow = LogEntries.GetEntryRowIndex(entry.globalLineIndex);
                 // ping object referred by the log entry
-                if (entry.instanceID != 0 && m_LastPingedEntry != entry.globalLineIndex)
+                if (entry.instanceID != 0 && m_LastPingedEntryRow != entryRow)
                 {
                     EditorGUIUtility.PingObject(entry.instanceID);
-                    m_LastPingedEntry = entry.globalLineIndex;
+                    m_LastPingedEntryRow = entryRow;
                 }
             }
             else
             {
                 m_CallstackTextStart = 0;
                 m_ActiveText = string.Empty;
-                m_LastPingedEntry = -1;
+                m_LastPingedEntryRow = -1;
                 m_ListView.row = -1;
                 m_CopyString.Clear();
                 m_ActiveMode = Mode.None;

Editor/Mono/ContainerWindow.bindings.cs

@@ -75,9 +75,8 @@ public extern Rect position
         [FreeFunction(k_ScriptingPrefix + "SendCaptionEvent", HasExplicitThis = true)]
         public extern void SendCaptionEvent(bool mouseDown);
 
-        // Close the editor window.
-        [FreeFunction(k_ScriptingPrefix + "InternalClose", HasExplicitThis = true)]
-        public extern void InternalClose();
+        [FreeFunction(k_ScriptingPrefix + "Internal_Destroy", HasExplicitThis = true)]
+        public extern void Internal_Destroy();
 
         [FreeFunction(k_ScriptingPrefix + "Internal_SetMinMaxSizes", HasExplicitThis = true)]
         private extern void Internal_SetMinMaxSizes(Vector2 minSize, Vector2 maxSize);

Editor/Mono/ContainerWindow.cs

@@ -7,7 +7,8 @@
 using System.Runtime.InteropServices;
 using System.Collections.Generic;
 using System;
-using System.Linq;
+using System.Text;
+using UnityEngine.Pool;
 using UnityEngine.Scripting;
 
 namespace UnityEditor
@@ -66,6 +67,11 @@ internal void __internalAwake()
             hideFlags = HideFlags.DontSave;
         }
 
+        private void OnDestroy()
+        {
+            Internal_Destroy();
+        }
+
         internal ShowMode showMode => (ShowMode)m_ShowMode;
 
         private string m_WindowID = null;
@@ -225,60 +231,69 @@ public void SetMinMaxSizes(Vector2 min, Vector2 max)
             Internal_SetMinMaxSizes(min, max);
         }
 
-        static internal bool InternalRequestCloseAll(bool keepMainWindow)
+        static internal bool CanCloseAll(bool includeMainWindow)
         {
-            var unsaved = windows
-                .Where(w => keepMainWindow || w.showMode != ShowMode.MainWindow)
-                .SelectMany(w => w.m_UnsavedEditorWindows)
-                .ToList();
+            using (var pooledObject = ListPool<EditorWindow>.Get(out List<EditorWindow> unsaved))
+            {
+                foreach (var window in windows)
+                {
+                    if (includeMainWindow || window.showMode != ShowMode.MainWindow)
+                    {
+                        unsaved.AddRange(window.m_UnsavedEditorWindows);
+                    }
+                }
 
-            if (unsaved.Any())
-                return PrivateRequestClose(unsaved);
+                if (unsaved.Count > 0)
+                    return AskToClose(unsaved);
 
-            return true;
+                return true;
+            }
         }
 
-        internal bool InternalRequestClose()
+        private bool CanClose()
         {
-            if (IsMainWindow())
-            {
-                var UnsavedWindows = windows.Where(w => w != s_MainWindow).SelectMany(w => w.m_UnsavedEditorWindows).ToList();
-
-                if (UnsavedWindows.Any())
-                    return PrivateRequestClose(UnsavedWindows);
-            }
-            if (hasUnsavedChanges)
+            if (Application.isHumanControllingUs && hasUnsavedChanges)
             {
-                return PrivateRequestClose(m_UnsavedEditorWindows);
+                return AskToClose(m_UnsavedEditorWindows);
             }
 
             return true;
         }
 
-        internal bool InternalRequestClose(EditorWindow dockedTab)
+        internal static bool CanClose(EditorWindow dockedTab)
         {
-            if (dockedTab.hasUnsavedChanges)
+            if (Application.isHumanControllingUs && dockedTab.hasUnsavedChanges)
             {
                 var unsaved = new List<EditorWindow>() { dockedTab };
-                return PrivateRequestClose(unsaved);
+                return AskToClose(unsaved);
             }
 
             return true;
         }
 
-        internal bool InternalRequestCloseAllExcept(EditorWindow editorWindow)
+        internal bool CanCloseAllExcept(EditorWindow editorWindow)
         {
-            var unsaved = m_UnsavedEditorWindows.Where(w => w != editorWindow);
+            if (!Application.isHumanControllingUs)
+                return true;
 
-            if (unsaved.Any())
-                return PrivateRequestClose(unsaved.ToList());
+            using (var pooledObject = ListPool<EditorWindow>.Get(out List<EditorWindow> unsaved))
+            {
+                foreach (var w in m_UnsavedEditorWindows)
+                {
+                    if (w != editorWindow)
+                        unsaved.Add(w);
+                }
+
+                if (unsaved.Count > 0)
+                    return AskToClose(unsaved);
+            }
 
             return true;
         }
 
-        internal static bool PrivateRequestClose(List<EditorWindow> allUnsaved)
+        private static bool AskToClose(List<EditorWindow> allUnsaved)
         {
-            Debug.Assert(allUnsaved.Count > 0);
+            Debug.Assert(Application.isHumanControllingUs && allUnsaved.Count > 0);
 
             const int kSave = 0;
             const int kCancel = 1;
@@ -288,20 +303,28 @@ internal static bool PrivateRequestClose(List<EditorWindow> allUnsaved)
 
             if (allUnsaved.Count == 1)
             {
-                var title = allUnsaved.First().titleContent.text;
+                var title = allUnsaved[0].titleContent.text;
 
                 option = EditorUtility.DisplayDialogComplex((string.IsNullOrEmpty(title) ? "" : (title + " - ")) + L10n.Tr("Unsaved Changes Detected"),
-                    allUnsaved.First().saveChangesMessage,
+                    allUnsaved[0].saveChangesMessage,
                     L10n.Tr("Save"),
                     L10n.Tr("Cancel"),
                     L10n.Tr("Discard"));
             }
             else
             {
-                string unsavedChangesMessage = string.Join("\n", allUnsaved.Select(v => v.saveChangesMessage).ToArray());
+                var savedChangesBuilder = new StringBuilder();
+
+                int last = allUnsaved.Count - 1;
+                for (int i = 0; i < last; ++i)
+                {
+                    savedChangesBuilder.Append(allUnsaved[i].saveChangesMessage);
+                    savedChangesBuilder.Append('\n');
+                }
+                savedChangesBuilder.Append(allUnsaved[last]);
 
                 option = EditorUtility.DisplayDialogComplex(L10n.Tr("Unsaved Changes Detected"),
-                    unsavedChangesMessage,
+                    savedChangesBuilder.ToString(),
                     L10n.Tr("Save All"),
                     L10n.Tr("Cancel"),
                     L10n.Tr("Discard All"));
@@ -342,11 +365,17 @@ internal static bool PrivateRequestClose(List<EditorWindow> allUnsaved)
             }
         }
 
-        internal void InternalCloseWindow()
+        // Closes the Window _without prompting_
+        public void Close()
         {
+            // Because this is a UnityObject, DestroyImmediate _will_ nullify the this pointer.
+            // This can guard against double-close
+            if (this == null)
+                return;
+
             Save();
 
-            if (m_ShowMode == (int)ShowMode.MainWindow && s_MainWindow == this)
+            if (s_MainWindow == this)
                 s_MainWindow = null;
 
             if (m_RootView)
@@ -358,6 +387,15 @@ internal void InternalCloseWindow()
             DestroyImmediate(this, true);
         }
 
+        [RequiredByNativeCode]
+        private void RequestCloseSentByNativeCode()
+        {
+            if (CanClose())
+            {
+                Close();
+            }
+        }
+
         [RequiredByNativeCode]
         internal bool IsMultiplayerClone()
         {
@@ -373,7 +411,7 @@ private static List<EditorWindow> FindUnsavedChanges(View view)
                 switch (v)
                 {
                     case DockArea dockArea:
-                        foreach (var windowClose in dockArea.m_Panes.OfType<EditorWindow>())
+                        foreach (var windowClose in dockArea.m_Panes)
                             if (windowClose.hasUnsavedChanges)
                                 unsavedChanges.Add(windowClose);
                         break;
@@ -395,16 +433,6 @@ public void UnsavedStateChanged()
             hasUnsavedChanges = m_UnsavedEditorWindows.Count > 0;
         }
 
-        public void Close()
-        {
-            Save();
-
-            // Guard against destroy window or window in the process of being destroyed.
-            if (this && m_WindowPtr.m_IntPtr != IntPtr.Zero)
-                InternalClose();
-            DestroyImmediate(this, true);
-        }
-
         internal bool IsNotDocked()
         {
             return ( // hallelujah
@@ -433,7 +461,17 @@ internal string GetWindowID()
 
             if (rootView.children.Length > 0)
             {
-                var dockArea = rootView.children.FirstOrDefault(c => c is DockArea) as DockArea;
+                DockArea dockArea = null;
+
+                foreach (var child in rootView.children)
+                {
+                    if (child is DockArea)
+                    {
+                        dockArea = (DockArea)child;
+                        break;
+                    }
+                }
+
                 if (dockArea && dockArea.m_Panes.Count > 0)
                 {
                     return (m_ShowMode == (int)ShowMode.Utility || m_ShowMode == (int)ShowMode.AuxWindow) ? v.actualView.GetType().ToString()
@@ -642,6 +680,5 @@ internal Rect GetDropDownRect(Rect buttonRect, Vector2 minSize, Vector2 maxSize)
         {
             return PopupLocationHelper.GetDropDownRect(buttonRect, minSize, maxSize, this);
         }
-
     }
 } //namespace

Editor/Mono/CustomInspectorStubs.cs

@@ -68,10 +68,21 @@ private InputManager() {}
         [SettingsProvider]
         internal static SettingsProvider CreateProjectSettingsProvider()
         {
-            var provider = AssetSettingsProvider.CreateProviderFromAssetPath(
-                "Project/Input Manager", "ProjectSettings/InputManager.asset",
-                SettingsProvider.GetSearchKeywordsFromPath("ProjectSettings/InputManager.asset"));
-            return provider;
+            // The new input system adds objects to InputManager.asset. This means we can't use AssetSettingsProvider.CreateProviderFromAssetPath
+            // as it will load *all* objects at that path and try to create an editor for it.
+            // NOTE: When the input system package is uninstalled, InputManager.asset will contain serialized MonoBehaviour objects for which
+            //       the C# classes are no longer available. They will thus not load correctly and appear as null entries.
+            var objects = AssetDatabase.LoadAllAssetsAtPath("ProjectSettings/InputManager.asset");
+            foreach (var obj in objects)
+            {
+                if (obj != null && obj.name == "InputManager")
+                {
+                    var provider = AssetSettingsProvider.CreateProviderFromObject("Project/Input Manager", obj,
+                        SettingsProvider.GetSearchKeywordsFromPath("ProjectSettings/InputManager.asset"));
+                    return provider;
+                }
+            }
+            return null;
         }
     }
 

Editor/Mono/EditorUserBuildSettings.bindings.cs

@@ -347,37 +347,35 @@ public enum EmbeddedArchitecture
     }
 
     [NativeType(Header = "Editor/Src/EditorUserBuildSettings.h")]
-    [Obsolete("QNXArchitecture is deprecated. Use EmbeddedArchitecture. (UnityUpgradeable) -> EmbeddedArchitecture")]
     public enum QNXArchitecture
     {
         [UnityEngine.InspectorName("Arm64")]
-        Arm64 = 0,
+        Arm64 = EmbeddedArchitecture.Arm64,
 
         [UnityEngine.InspectorName("Arm32")]
-        Arm32 = 1,
+        Arm32 = EmbeddedArchitecture.Arm32,
 
         [UnityEngine.InspectorName("X64")]
-        X64 = 2,
+        X64 = EmbeddedArchitecture.X64,
 
         [UnityEngine.InspectorName("X86")]
-        X86 = 3,
+        X86 = EmbeddedArchitecture.X86,
     }
 
     [NativeType(Header = "Editor/Src/EditorUserBuildSettings.h")]
-    [Obsolete("EmbeddedLinuxArchitecture is deprecated. Use EmbeddedArchitecture. (UnityUpgradeable) -> EmbeddedArchitecture")]
     public enum EmbeddedLinuxArchitecture
     {
         [UnityEngine.InspectorName("Arm64")]
-        Arm64 = 0,
+        Arm64 = EmbeddedArchitecture.Arm64,
 
         [UnityEngine.InspectorName("Arm32")]
-        Arm32 = 1,
+        Arm32 = EmbeddedArchitecture.Arm32,
 
         [UnityEngine.InspectorName("X64")]
-        X64 = 2,
+        X64 = EmbeddedArchitecture.X64,
 
         [UnityEngine.InspectorName("X86")]
-        X86 = 3,
+        X86 = EmbeddedArchitecture.X86,
     }
 
     [NativeHeader("Editor/Src/EditorUserBuildSettings.h")]
@@ -414,7 +412,7 @@ public static extern QNXOsVersion selectedQnxOsVersion
         }
 
         // QNX Architecture
-        public static extern EmbeddedArchitecture selectedQnxArchitecture
+        public static extern QNXArchitecture selectedQnxArchitecture
         {
             [NativeMethod("GetSelectedQNXArchitecture")]
             get;
@@ -423,7 +421,7 @@ public static extern EmbeddedArchitecture selectedQnxArchitecture
         }
 
         // Embedded Linux Architecture
-        public static extern EmbeddedArchitecture selectedEmbeddedLinuxArchitecture
+        public static extern EmbeddedLinuxArchitecture selectedEmbeddedLinuxArchitecture
         {
             [NativeMethod("GetSelectedEmbeddedLinuxArchitecture")]
             get;