Unity 2021.1.0a9 C# reference source code

Author: Unity Technologies

Editor/Mono/2D/SpriteAtlas/SpriteAtlasImporterInspector.cs

@@ -236,7 +236,7 @@ void OnEnable()
 
             m_EnableTightPacking = serializedAssetObject.FindProperty("m_ImporterData.packingSettings.enableTightPacking");
             m_EnableRotation = serializedAssetObject.FindProperty("m_ImporterData.packingSettings.enableRotation");
-            m_EnableAlphaDilation = serializedObject.FindProperty("m_EditorData.packingSettings.enableAlphaDilation");
+            m_EnableAlphaDilation = serializedAssetObject.FindProperty("m_ImporterData.packingSettings.enableAlphaDilation");
             m_Padding = serializedAssetObject.FindProperty("m_ImporterData.packingSettings.padding");
 
             m_MasterAtlas = serializedAssetObject.FindProperty("m_MasterAtlas");

Editor/Mono/AssemblyInfo/AssemblyInfo.cs

@@ -39,6 +39,7 @@
 [assembly: InternalsVisibleTo("UnityEditor.Android.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.XboxOne.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.PS4.Extensions")]
+[assembly: InternalsVisibleTo("UnityEditor.PS5.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.Switch.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.WebGL.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.LinuxStandalone.Extensions")]
@@ -121,6 +122,7 @@
 [assembly: InternalsVisibleTo("Unity.UIElements.Tests")]
 [assembly: InternalsVisibleTo("Unity.UIElements.EditorTests")]
 [assembly: InternalsVisibleTo("UnityEditor.UIElementsGameObjectsModule")]
+[assembly: InternalsVisibleTo("UnityEditor.TextCoreTextModule")]
 
 [assembly: InternalsVisibleTo("Unity.SceneTemplate.Editor")]
 [assembly: InternalsVisibleTo("com.unity.purchasing.udp.Editor")]

Editor/Mono/BuildPipeline/DesktopStandalonePostProcessor.cs

@@ -94,7 +94,10 @@ public override void UpdateBootConfig(BuildTarget target, BootConfigData config,
         if (IL2CPPUtils.UseIl2CppCodegenWithMonoBackend(BuildPipeline.GetBuildTargetGroup(target)))
             config.Set("mono-codegen", "il2cpp");
         if ((options & BuildOptions.EnableHeadlessMode) != 0)
+        {
             config.AddKey("headless");
+            config.AddKey("force-gfx-direct");
+        }
         if ((options & BuildOptions.EnableCodeCoverage) != 0)
             config.Set("enableCodeCoverage", "1");
         if (!PlayerSettings.usePlayerLog)

Editor/Mono/BuildTarget.cs

@@ -127,6 +127,9 @@ public enum BuildTarget
         GameCoreScarlett = 42,
         GameCoreXboxOne = 43,
 
+        PS5 = 44,
+
+
         // obsolete identifiers. We're using different values so that ToString() works.
         [System.Obsolete("Use iOS instead (UnityUpgradable) -> iOS", true)]
         iPhone = -1,

Editor/Mono/BuildTargetConverter.cs

@@ -16,6 +16,8 @@ internal class BuildTargetConverter
                     return RuntimePlatform.Android;
                 case BuildTarget.PS4:
                     return RuntimePlatform.PS4;
+                case BuildTarget.PS5:
+                    return RuntimePlatform.PS5;
                 case BuildTarget.StandaloneLinux64:
                     return RuntimePlatform.LinuxPlayer;
                 case BuildTarget.StandaloneOSX:

Editor/Mono/BuildTargetGroup.cs

@@ -102,6 +102,8 @@ public enum BuildTargetGroup
         CloudRendering = 30,
 
         GameCoreScarlett = 31,
-        GameCoreXboxOne = 32
+        GameCoreXboxOne = 32,
+
+        PS5 = 33,
     }
 }

Editor/Mono/EditorGUI.cs

@@ -317,6 +317,22 @@ public void Dispose()
             }
         }
 
+        internal struct CursorColorScope : IDisposable
+        {
+            private Color oldCursorColor;
+
+            public CursorColorScope(Color color)
+            {
+                oldCursorColor = GUI.skin.settings.cursorColor;
+                GUI.skin.settings.cursorColor = color;
+            }
+
+            public void Dispose()
+            {
+                GUI.skin.settings.cursorColor = oldCursorColor;
+            }
+        }
+
         // Create a group of controls that can be disabled.
         internal static void BeginDisabled(bool disabled)
         {
@@ -584,14 +600,14 @@ static void ShowTextEditorPopupMenu()
             // Cut
             if (RecycledTextEditor.s_AllowContextCutOrPaste)
             {
-                if (s_RecycledEditor.hasSelection && !s_RecycledEditor.isPasswordField && enabled)
+                if (s_RecycledEditor.hasSelection && !s_RecycledEditor.isPasswordField && enabled && !EditorGUI.showMixedValue)
                     pm.AddItem(EditorGUIUtility.TrTextContent("Cut"), false, new PopupMenuEvent(EventCommandNames.Cut, GUIView.current).SendEvent);
                 else
                     pm.AddDisabledItem(EditorGUIUtility.TrTextContent("Cut"));
             }
 
             // Copy -- when GUI is disabled, allow Copy even with no selection (will copy everything)
-            if ((s_RecycledEditor.hasSelection || !enabled) && !s_RecycledEditor.isPasswordField)
+            if ((s_RecycledEditor.hasSelection || !enabled) && !s_RecycledEditor.isPasswordField && !EditorGUI.showMixedValue)
                 pm.AddItem(EditorGUIUtility.TrTextContent("Copy"), false, new PopupMenuEvent(EventCommandNames.Copy, GUIView.current).SendEvent);
             else
                 pm.AddDisabledItem(EditorGUIUtility.TrTextContent("Copy"));
@@ -1912,19 +1928,17 @@ internal static void SelectableLabelInternal(Rect position, string text, GUIStyl
                 sendEventToTextEditor = false;
             }
 
-
-            Color tempCursorColor = GUI.skin.settings.cursorColor;
-            GUI.skin.settings.cursorColor = new Color(0, 0, 0, 0);
-
-            RecycledTextEditor.s_AllowContextCutOrPaste = false;
-
-            if (sendEventToTextEditor)
+            // Its possible that DoTextField will throw so we use a scoped cursor that we can safely reset the color.
+            using (new CursorColorScope(Color.clear))
             {
-                bool dummy;
-                DoTextField(s_RecycledEditor, id, IndentedRect(position), text, style, string.Empty, out dummy, false, true, false);
-            }
+                RecycledTextEditor.s_AllowContextCutOrPaste = false;
 
-            GUI.skin.settings.cursorColor = tempCursorColor;
+                if (sendEventToTextEditor)
+                {
+                    bool dummy;
+                    DoTextField(s_RecycledEditor, id, IndentedRect(position), text, style, string.Empty, out dummy, false, true, false);
+                }
+            }
         }
 
         [Obsolete("Use PasswordField instead.")]

Editor/Mono/EditorGUIUtility.cs

@@ -1200,6 +1200,7 @@ internal static void ResetGUIState()
             EditorGUI.ClearStacks();
             fieldWidth = 0;
             labelWidth = 0;
+            currentViewWidth = -1f;
 
             SetBoldDefaultFont(false);
             UnlockContextWidth();
@@ -1314,7 +1315,21 @@ internal static float contextWidth
             }
         }
 
-        public static float currentViewWidth => GUIView.current ? GUIView.current.position.width : 0;
+        private static float s_OverriddenViewWidth = -1f;
+        public static float currentViewWidth
+        {
+            get
+            {
+                if (s_OverriddenViewWidth > 0f)
+                    return s_OverriddenViewWidth;
+                CheckOnGUI();
+                return GUIView.current ? GUIView.current.position.width : 0;
+            }
+            internal set
+            {
+                s_OverriddenViewWidth = value;
+            }
+        }
 
         public static float labelWidth
         {

Editor/Mono/EditorUserBuildSettings.bindings.cs

@@ -177,6 +177,7 @@ public enum WSABuildAndRunDeployTarget
         /// *undocumented*
         LocalMachine = 0,
         /// *undocumented*
+        [System.Obsolete("UnityEditor.WSABuildAndRunDeployTarget.WindowsPhone is obsolete.", true)]
         WindowsPhone = 1,
         /// *undocumented*
         DevicePortal = 2

Editor/Mono/GUI/AppStatusBar.cs

@@ -98,6 +98,7 @@ protected override void OnDisable()
             Progress.added -= RefreshProgressBar;
             Progress.removed -= RefreshProgressBar;
             Progress.updated -= RefreshProgressBar;
+            EditorApplication.delayCall -= DelayRepaint;
             base.OnDisable();
         }
 
@@ -239,9 +240,15 @@ private void DrawSpecialModeLabel()
 
         float k_SpaceBeforeProgress = 15;
         float k_SpaceAfterProgress = 4;
+
+        private void DelayRepaint()
+        {
+            Repaint();
+        }
+
         private void DrawProgressBar()
         {
-            if (!showProgress)
+            if (!this || !showProgress)
                 return;
 
             GUILayout.Space(k_SpaceBeforeProgress);
@@ -259,7 +266,7 @@ private void DrawProgressBar()
                 Progress.ShowDetails();
 
             if (globalProgress == -1.0f)
-                EditorApplication.delayCall += () => Repaint();
+                EditorApplication.delayCall += DelayRepaint;
 
             EditorGUIUtility.AddCursorRect(progressRect, MouseCursor.Link);
             GUILayout.Space(k_SpaceAfterProgress);
@@ -350,6 +357,9 @@ private void DrawStatusText()
 
         private void RefreshProgressBar(Progress.Item[] progressItems)
         {
+            if (!this || !showProgress)
+                return;
+
             var idleCount = Progress.EnumerateItems().Count(item => item.running && item.priority == (int)Progress.Priority.Idle);
             var taskCount = Progress.GetRunningProgressCount() - idleCount;
             if (taskCount == 0)