Unity 6000.0.2f1 C# reference source code

Author: Unity Technologies

Editor/Mono/Audio/AudioContainerWindow.cs

@@ -1343,6 +1343,19 @@ void OnAssetsDeleted(IEnumerable<string> paths)
             }
     }
 
+    void OnAssetsMoved(IEnumerable<string> paths)
+    {
+        // If there is no target we are in day 0 state.
+        if (State.AudioContainer == null)
+            return;
+
+        foreach (var path in paths)
+            if (path == State.TargetPath)
+            {
+                State.UpdateTargetPath();
+            }
+    }
+
     class AudioContainerModificationProcessor : AssetModificationProcessor
     {
         /// <summary>
@@ -1366,11 +1379,14 @@ class AudioContainerPostProcessor : AssetPostprocessor
         /// and relays it to AudioContainerWindow,
         /// refreshing or clearing the window content.
         /// </summary>
-        static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssetPaths)
+        static void OnPostprocessAllAssets(string[] importedAssets, string[] deletedAssets, string[] movedAssets, string[] movedFromAssets)
         {
             if (Instance == null)
                 return;
 
+            if (movedFromAssets.Length > 0)
+                Instance.OnAssetsMoved(movedFromAssets);
+
             if (importedAssets.Length > 0)
                 Instance.OnAssetsImported(importedAssets);
 

Editor/Mono/Audio/AudioContainerWindowState.cs

@@ -5,6 +5,7 @@
 using System;
 using UnityEditor.UIElements;
 using UnityEngine;
+using UnityEngine.Assertions;
 using UnityEngine.Audio;
 using UnityEngine.UIElements;
 using Object = UnityEngine.Object;
@@ -59,13 +60,25 @@ internal SerializedObject SerializedObject
 
     internal string TargetPath { get; private set; }
 
+    internal void UpdateTargetPath()
+    {
+        if (m_AudioContainer != null)
+        {
+            TargetPath = AssetDatabase.GetAssetPath(m_AudioContainer);
+        }
+        else
+        {
+            TargetPath = null;
+        }
+    }
+
     internal void Reset()
     {
         Stop();
         m_AudioContainer = null;
         m_SerializedObject = null;
         m_IsPlayingOrPausedLocalFlag = false;
-        TargetPath = null;
+        UpdateTargetPath();
     }
 
     internal VisualElement GetResourceTrackerElement()
@@ -164,7 +177,7 @@ void UpdateTarget()
 
         if (m_AudioContainer != null)
         {
-            TargetPath = AssetDatabase.GetAssetPath(m_AudioContainer);
+            UpdateTargetPath();
         }
 
         if (targetChanged)
@@ -174,17 +187,7 @@ void UpdateTarget()
 
         if (trackedSourceChanged)
         {
-            if (m_ResourceTrackerElement != null)
-            {
-                m_ResourceTrackerElement.Unbind();
-            }
-
-            if (m_TrackedSource != null)
-            {
-                var trackedSourceSO = new SerializedObject(m_TrackedSource);
-                var trackedSourceResourceProperty = trackedSourceSO.FindProperty("m_Resource");
-                m_ResourceTrackerElement.TrackPropertyValue(trackedSourceResourceProperty, OnResourceChanged);
-            }
+            UpdateResourceTrackerElement();
         }
     }
 
@@ -199,9 +202,28 @@ void OnResourceChanged(SerializedProperty property)
         m_AudioContainer = container;
 
         if (m_AudioContainer != null)
-            TargetPath = AssetDatabase.GetAssetPath(m_AudioContainer);
+        {
+            UpdateTargetPath();
+        }
 
         TargetChanged?.Invoke(this, EventArgs.Empty);
+
+        UpdateResourceTrackerElement();
+    }
+
+    private void UpdateResourceTrackerElement()
+    {
+        if (m_ResourceTrackerElement != null)
+        {
+            m_ResourceTrackerElement.Unbind();
+        }
+
+        if (m_TrackedSource != null)
+        {
+            var trackedSourceSO = new SerializedObject(m_TrackedSource);
+            var trackedSourceResourceProperty = trackedSourceSO.FindProperty("m_Resource");
+            m_ResourceTrackerElement.TrackPropertyValue(trackedSourceResourceProperty, OnResourceChanged);
+        }
     }
 
     internal void Play()

Editor/Mono/BuildProfile/BuildProfileModuleUtil.cs

@@ -31,7 +31,6 @@ internal class BuildProfileModuleUtil
         static HashSet<string> s_BuildProfileIconModules = new()
         {
             "Switch",
-            "QNX",
         };
 
         /// <summary>

Editor/Mono/ContainerWindow.cs

@@ -68,6 +68,8 @@ public ContainerWindow()
             m_UnsavedEditorWindows = new List<EditorWindow>();
         }
 
+        private static Func<bool> MppmCloseCallback;
+
         internal void __internalAwake()
         {
             hideFlags = HideFlags.DontSave;
@@ -325,12 +327,14 @@ internal bool CanCloseAllExcept(EditorWindow editorWindow)
 
         private static bool MultiplayerCloneClose()
         {
-            var shouldClose = EditorUtility.DisplayDialog(L10n.Tr("Warning: Deactivating a Virtual Player"),
-                L10n.Tr("Closing this window will deactivate the virtual player. Are you sure you want to close the window?"),
-                L10n.Tr("Close"),
-                L10n.Tr("Keep Open"));
+            if (MppmCloseCallback != null)
+                return MppmCloseCallback.Invoke();
+            return true;
+        }
 
-            return shouldClose;
+        internal static void SetMppmCanCloseCallback(Func<bool> mppmCanCloseCallback )
+        {
+            MppmCloseCallback = mppmCanCloseCallback;
         }
 
         private static bool AskToClose(List<EditorWindow> allUnsaved)

Editor/Mono/EditorGUI.cs

@@ -37,9 +37,12 @@ public sealed partial class EditorGUI
     {
         private static RecycledTextEditor activeEditor;
 
-        internal static DelayedTextEditor s_DelayedTextEditor = new DelayedTextEditor();
+        private static DelayedTextEditor s_DelayedTextEditorInternal;
+        internal static DelayedTextEditor s_DelayedTextEditor => s_DelayedTextEditorInternal ??= new();
+
+        internal static RecycledTextEditor s_RecycledEditorInternal;
+        internal static RecycledTextEditor s_RecycledEditor => s_RecycledEditorInternal ??= new();
 
-        internal static RecycledTextEditor s_RecycledEditor = new RecycledTextEditor();
         internal static string s_OriginalText = "";
         internal static string s_RecycledCurrentEditingString;
         private static bool bKeyEventActive = false;

Editor/Mono/Inspector/Core/PropertyEditor.cs

@@ -470,7 +470,7 @@ protected virtual void OnGUI()
         [UsedImplicitly]
         protected virtual void Update()
         {
-            ActiveEditorTracker.Internal_GetActiveEditorsNonAlloc(tracker, s_Editors);
+            ActiveEditorTracker.Internal_GetActiveEditorsNonAlloc(tracker, ref s_Editors);
             if (s_Editors.Length == 0)
                 return;
 
@@ -1698,7 +1698,7 @@ private void DrawPreviewAndLabels()
                     if (GUI.Button(foldoutRect, title, Styles.preDropDown))
                     {
                         EditorUtility.DisplayCustomMenu(foldoutRect, panelOptions, selectedPreview,
-                            OnPreviewSelected, editorsWithPreviews);
+                            OnPreviewSelected, editorsWithPreviews.ToArray());
                     }
                 }
                 else
@@ -1822,7 +1822,7 @@ private void DrawFooter()
 
         private void OnPreviewSelected(object userData, string[] options, int selected)
         {
-            IPreviewable[] availablePreviews = userData as IPreviewable[];
+            var availablePreviews = (IPreviewable[])userData;
             m_SelectedPreview = availablePreviews[selected];
         }