Unity 2021.1.0a8 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/AnimationWindow/CurveEditor.cs

@@ -1326,11 +1326,16 @@ void DragTangents()
                                     key.inTangent = tangentDirection.y / tangentDirection.x;
                                     key.inWeight = Mathf.Clamp(Mathf.Abs(tangentDirection.x / dx), 0f, 1f);
                                 }
-                                else
+                                else if (tangentDirection.y > 0)
                                 {
                                     key.inTangent = Mathf.Infinity;
                                     key.inWeight = 0f;
                                 }
+                                else
+                                {
+                                    key.inTangent = -Mathf.Infinity;
+                                    key.inWeight = 0f;
+                                }
                                 AnimationUtility.SetKeyLeftTangentMode(ref key, TangentMode.Free);
 
                                 if (!AnimationUtility.GetKeyBroken(key))
@@ -1350,11 +1355,16 @@ void DragTangents()
                                     key.outTangent = tangentDirection.y / tangentDirection.x;
                                     key.outWeight = Mathf.Clamp(Mathf.Abs(tangentDirection.x / dx), 0f, 1f);
                                 }
-                                else
+                                else if (tangentDirection.y > 0)
                                 {
                                     key.outTangent = Mathf.Infinity;
                                     key.outWeight = 0f;
                                 }
+                                else
+                                {
+                                    key.outTangent = -Mathf.Infinity;
+                                    key.outWeight = 0f;
+                                }
                                 AnimationUtility.SetKeyRightTangentMode(ref key, TangentMode.Free);
 
                                 if (!AnimationUtility.GetKeyBroken(key))
@@ -3112,6 +3122,7 @@ Vector2 GetPosition(CurveSelection selection)
             {
                 Vector2 dir = new Vector2(1.0F, key.inTangent);
                 if (key.inTangent == Mathf.Infinity) dir = new Vector2(0, -1);
+                else if (key.inTangent == -Mathf.Infinity) dir = new Vector2(0, 1);
 
                 Vector2 viewDir = NormalizeInViewSpace(dir);
 
@@ -3135,6 +3146,7 @@ Vector2 GetPosition(CurveSelection selection)
             {
                 Vector2 dir = new Vector2(1.0F, key.outTangent);
                 if (key.outTangent == Mathf.Infinity) dir = new Vector2(0, -1);
+                else if (key.outTangent == -Mathf.Infinity) dir = new Vector2(0, 1);
 
                 Vector2 viewDir = NormalizeInViewSpace(dir);
 

Editor/Mono/BuildPipeline/BuildPipelineInterfaces.cs

@@ -143,7 +143,7 @@ internal enum BuildCallbacks
         //common comparer for all callback types
         internal static int CompareICallbackOrder(IOrderedCallback a, IOrderedCallback b)
         {
-            return a.callbackOrder - b.callbackOrder;
+            return a.callbackOrder.CompareTo(b.callbackOrder);
         }
 
         static void AddToList<T>(object o, ref List<T> list) where T : class

Editor/Mono/BuildPlayerWindow.cs

@@ -244,7 +244,7 @@ private void ActiveBuildTargetsGUI()
 
             // Switching build target in the editor
             BuildTarget selectedTarget = EditorUserBuildSettingsUtils.CalculateSelectedBuildTarget();
-            BuildTargetGroup selectedTargetGroup = EditorUserBuildSettings.selectedBuildTargetGroup;
+            BuildTargetGroup selectedTargetGroup = EditorUserBuildSettingsUtils.CalculateSelectedBuildTargetGroup();
 
             GUILayout.BeginHorizontal();
 
@@ -596,7 +596,7 @@ void ShowBuildTargetSettings()
             EditorGUIUtility.labelWidth = Mathf.Min(180, (position.width - 265) * 0.47f);
 
             BuildTarget buildTarget = EditorUserBuildSettingsUtils.CalculateSelectedBuildTarget();
-            BuildTargetGroup buildTargetGroup = EditorUserBuildSettings.selectedBuildTargetGroup;
+            BuildTargetGroup buildTargetGroup = EditorUserBuildSettingsUtils.CalculateSelectedBuildTargetGroup();
             BuildPlatform platform = BuildPlatforms.instance.BuildPlatformFromTargetGroup(buildTargetGroup);
             bool licensed = BuildPipeline.LicenseCheck(buildTarget);
 
@@ -967,7 +967,7 @@ private static void GUIBuildButtons(IBuildWindowExtension buildWindowExtension,
 
             // Switching build target in the editor
             BuildTarget selectedTarget = EditorUserBuildSettingsUtils.CalculateSelectedBuildTarget();
-            BuildTargetGroup selectedTargetGroup = EditorUserBuildSettings.selectedBuildTargetGroup;
+            BuildTargetGroup selectedTargetGroup = EditorUserBuildSettingsUtils.CalculateSelectedBuildTargetGroup();
 
             bool selectedTargetIsActive = EditorUserBuildSettings.activeBuildTarget == selectedTarget &&
                 EditorUserBuildSettings.activeBuildTargetGroup == selectedTargetGroup;

Editor/Mono/ConsoleWindow.cs

@@ -639,7 +639,7 @@ internal void OnGUI()
 
                         if (string.IsNullOrEmpty(m_SearchText))
                             errorModeStyle.Draw(textRect, tempContent, id, m_ListView.row == el.row);
-                        else
+                        else if (text != null)
                         {
                             //the whole text contains the searchtext, we have to know where it is
                             int startIndex = text.IndexOf(m_SearchText, StringComparison.OrdinalIgnoreCase);

Editor/Mono/ContainerWindow.cs

@@ -38,7 +38,7 @@ internal partial class ContainerWindow : ScriptableObject
         static internal bool linuxEditor => Application.platform == RuntimePlatform.LinuxEditor;
 
         static internal bool s_Modal = false;
-        private static bool hasMainWindow = false;
+        private static ContainerWindow s_MainWindow;
 
         private static class Styles
         {
@@ -137,7 +137,7 @@ internal void ShowPopupWithMode(ShowMode mode, bool giveFocus)
         // Show the editor window.
         public void Show(ShowMode showMode, bool loadPosition, bool displayImmediately, bool setFocus)
         {
-            if (hasMainWindow && showMode == ShowMode.MainWindow)
+            if (showMode == ShowMode.MainWindow && s_MainWindow && s_MainWindow != this)
                 throw new InvalidOperationException("Trying to create a second main window from layout when one already exists.");
 
             bool useMousePos = showMode == ShowMode.AuxWindow;
@@ -173,7 +173,7 @@ public void Show(ShowMode showMode, bool loadPosition, bool displayImmediately,
                 return;
 
             if (showMode == ShowMode.MainWindow)
-                hasMainWindow = true;
+                s_MainWindow = this;
 
             // Fit window to screen - needs to be done after bringing the window live
             position = FitWindowRectToScreen(m_PixelRect, true, useMousePos);
@@ -290,8 +290,8 @@ internal void InternalCloseWindow()
         {
             Save();
 
-            if (m_ShowMode == (int)ShowMode.MainWindow)
-                hasMainWindow = false;
+            if (m_ShowMode == (int)ShowMode.MainWindow && s_MainWindow == this)
+                s_MainWindow = null;
 
             if (m_RootView)
             {

Editor/Mono/EditorUserBuildSettingsUtils.cs

@@ -10,11 +10,16 @@ internal static class EditorUserBuildSettingsUtils
     {
         public static BuildTarget CalculateSelectedBuildTarget()
         {
-            BuildTargetGroup targetGroup = EditorUserBuildSettings.selectedBuildTargetGroup;
+            BuildTargetGroup targetGroup = CalculateSelectedBuildTargetGroup();
             switch (targetGroup)
             {
                 case BuildTargetGroup.Standalone:
-                    return DesktopStandaloneBuildWindowExtension.GetBestStandaloneTarget(EditorUserBuildSettings.selectedStandaloneTarget);
+                {
+                    BuildTarget target = EditorUserBuildSettings.selectedStandaloneTarget;
+                    if (target == BuildTarget.NoTarget)
+                        target = EditorUserBuildSettings.activeBuildTarget;
+                    return DesktopStandaloneBuildWindowExtension.GetBestStandaloneTarget(target);
+                }
                 default:
                     if (BuildPlatforms.instance == null)
                         throw new System.Exception("Build platforms are not initialized.");
@@ -24,5 +29,13 @@ public static BuildTarget CalculateSelectedBuildTarget()
                     return platform.defaultTarget;
             }
         }
+
+        public static BuildTargetGroup CalculateSelectedBuildTargetGroup()
+        {
+            BuildTargetGroup targetGroup = EditorUserBuildSettings.selectedBuildTargetGroup;
+            if (targetGroup == BuildTargetGroup.Unknown)
+                targetGroup = EditorUserBuildSettings.activeBuildTargetGroup;
+            return targetGroup;
+        }
     }
 }

Editor/Mono/EditorUtility.cs

@@ -552,8 +552,8 @@ internal static void DisplayObjectContextMenu(Rect position, Object[] context, i
                     // Handle modified component.
                     if (hasPrefabOverride)
                     {
-                        bool defaultOverrides =
-                            PrefabUtility.IsObjectOverrideAllDefaultOverridesComparedToAnySource(targetObject);
+                        bool isObjectOverrideAllDefaultOverridesComparedToOriginalSource =
+                            PrefabUtility.IsObjectOverrideAllDefaultOverridesComparedToOriginalSource(targetObject);
 
                         PrefabUtility.HandleApplyRevertMenuItems(
                             "Modified Component",
@@ -573,7 +573,7 @@ internal static void DisplayObjectContextMenu(Rect position, Object[] context, i
                             {
                                 pm.AddItem(menuItemContent, false, TargetChoiceHandler.RevertPrefabObjectOverride, targetObject);
                             },
-                            defaultOverrides
+                            isObjectOverrideAllDefaultOverridesComparedToOriginalSource
                         );
                     }
                 }

Editor/Mono/EditorWindow.cs

@@ -1064,6 +1064,12 @@ internal void SetMainPlayModeViewSize(Vector2 targetSize)
                 m_Parent.SetMainPlayModeViewSize(targetSize);
         }
 
+        internal void SetDisplayViewSize(int displayId, Vector2 targetSize)
+        {
+            if (m_Parent != null)
+                m_Parent.SetDisplayViewSize(displayId, targetSize);
+        }
+
         internal void SetPlayModeView(bool value)
         {
             m_IsPlayModeView = value;

Editor/Mono/GUI/ReorderableList.cs

@@ -64,7 +64,7 @@ public class ReorderableList
 
         private SerializedObject m_SerializedObject;
         private SerializedProperty m_Elements;
-        private string m_PropertyPath;
+        private string m_PropertyPath = string.Empty;
         private IList m_ElementList;
         private bool m_Draggable;
         private float m_DraggedY;
@@ -75,6 +75,8 @@ public class ReorderableList
         public bool displayAdd;
         public bool displayRemove;
 
+        bool scheduleRemove;
+
         internal bool m_IsEditable;
         internal bool m_HasPropertyDrawer;
 
@@ -202,7 +204,7 @@ public void DrawFooter(Rect rect, ReorderableList list)
                         || (list.onCanRemoveCallback != null && !list.onCanRemoveCallback(list))
                         || list.isOverMaxMultiEditLimit))
                     {
-                        if (GUI.Button(removeRect, iconToolbarMinus, preButton))
+                        if (GUI.Button(removeRect, iconToolbarMinus, preButton) || GUI.enabled && list.scheduleRemove)
                         {
                             if (list.onRemoveCallback == null)
                             {
@@ -213,9 +215,12 @@ public void DrawFooter(Rect rect, ReorderableList list)
 
                             list.onChangedCallback?.Invoke(list);
                             list.ClearCacheRecursive();
+                            GUI.changed = true;
                         }
                     }
                 }
+
+                list.scheduleRemove = false;
             }
 
             // default add button behavior
@@ -460,7 +465,7 @@ public IList list
         public int index
         {
             get { return m_Selection.Count > 0 ? m_Selection[0] : count - 1; }
-            set { Select(value < 0 ? count - 1 : value); }
+            set { Select(value > count - 1 ? 0 : value < 0 ? count - 1 : value); }
         }
 
         public ReadOnlyCollection<int> selectedIndices => new ReadOnlyCollection<int>(m_Selection);
@@ -973,6 +978,7 @@ private void DoListElements(Rect listRect, Rect visibleRect)
                             index = i;
                             handlingInput = false;
                         }
+
                         // Element drawing could be changed from distant properties or controls
                         // so if we detect any change in the way the property is drawn, clear cache
                         int currentControlCount = EditorGUI.s_PropertyCount - initialProperties;
@@ -982,6 +988,11 @@ private void DoListElements(Rect listRect, Rect visibleRect)
                             GUI.changed = true;
                         }
                         m_PropertyCache[i].lastControlCount = currentControlCount;
+
+                        // If an event was consumed in the course of running this for loop, then there is
+                        // a good chance the array data has changed and it is dangerous for us to continue
+                        // rendering it in this frame.
+                        if (Event.current.type == EventType.Used) break;
                     }
                 }
 
@@ -1035,6 +1046,12 @@ private void DoListElements(Rect listRect, Rect visibleRect)
 
         private void DoListHeader(Rect headerRect)
         {
+            // Ensure there's proper Prefab and context menu handling for the list as a whole.
+            // This ensures a deleted element in the list is displayed as an override and can
+            // be handled by the user via the context menu. Case 1292522
+            if (m_Elements != null)
+                EditorGUI.BeginProperty(headerRect, GUIContent.none, m_Elements);
+
             recursionCounter = 0;
             // draw the background on repaint
             if (showDefaultBackground && Event.current.type == EventType.Repaint)
@@ -1051,6 +1068,9 @@ private void DoListHeader(Rect headerRect)
                 drawHeaderCallback(headerRect);
             else if (m_DisplayHeader)
                 defaultBehaviours.DrawHeader(headerRect, m_SerializedObject, m_Elements, m_ElementList);
+
+            if (m_Elements != null)
+                EditorGUI.EndProperty();
         }
 
         private void DoListFooter(Rect footerRect)
@@ -1070,7 +1090,7 @@ private void DoDraggingAndSelection(Rect listRect)
             switch (evt.GetTypeForControl(id))
             {
                 case EventType.KeyDown:
-                    if (GUIUtility.keyboardControl != id)
+                    if (GUIUtility.keyboardControl != id || m_Dragging || clicked)
                         return;
                     // if we have keyboard focus, arrow through the list
                     if (evt.keyCode == KeyCode.DownArrow)
@@ -1083,6 +1103,42 @@ private void DoDraggingAndSelection(Rect listRect)
                         index -= 1;
                         evt.Use();
                     }
+                    if (evt.keyCode == KeyCode.LeftArrow)
+                    {
+                        if (m_Elements != null)
+                        {
+                            foreach (var index in m_Selection)
+                            {
+                                if (index < 0) continue;
+
+                                m_Elements.GetArrayElementAtIndex(index).isExpanded = false;
+                            }
+                        }
+                        InvalidateParentCaches(m_PropertyPath);
+                        GUI.changed = true;
+                        evt.Use();
+                    }
+                    if (evt.keyCode == KeyCode.RightArrow)
+                    {
+                        if (m_Elements != null)
+                        {
+                            foreach (var index in selectedIndices)
+                            {
+                                if (index < 0) continue;
+
+                                m_Elements.GetArrayElementAtIndex(index).isExpanded = true;
+                            }
+                        }
+                        InvalidateParentCaches(m_PropertyPath);
+                        GUI.changed = true;
+                        evt.Use();
+                    }
+                    if (evt.keyCode == KeyCode.Delete)
+                    {
+                        scheduleRemove = true;
+                        InvalidateParentCaches(m_PropertyPath);
+                        evt.Use();
+                    }
                     if (evt.keyCode == KeyCode.Escape && GUIUtility.hotControl == id)
                     {
                         GUIUtility.hotControl = 0;
@@ -1092,7 +1148,7 @@ private void DoDraggingAndSelection(Rect listRect)
                     if (evt.type == EventType.Used)
                     {
                         // don't allow arrowing through the ends of the list
-                        index = Mathf.Clamp(index, 0, (m_Elements != null) ? m_Elements.arraySize - 1 : m_ElementList.Count - 1);
+                        m_Selection = m_Selection.Where(i => i >= 0 && i < (m_Elements != null ? m_Elements.arraySize : m_ElementList.Count)).ToList();
                     }
                     break;
 
@@ -1172,6 +1228,7 @@ private void DoDraggingAndSelection(Rect listRect)
                     break;
 
                 case EventType.MouseUp:
+                    clicked = false;
                     if (!m_Draggable)
                     {
                         // if mouse up was on the same index as mouse down we fire a mouse up callback (useful if for beginning renaming on mouseup)

Editor/Mono/GUI/SearchField.cs

@@ -61,7 +61,7 @@ public string OnGUI(Rect rect, string text, GUIStyle style, GUIStyle cancelButto
             buttonRect.width = cancelButtonWidth;
             if (Event.current.type == EventType.MouseUp && buttonRect.Contains(Event.current.mousePosition))
             {
-                text = "";
+                text = string.Empty;
                 GUIUtility.keyboardControl = 0;
             }
 
@@ -70,7 +70,7 @@ public string OnGUI(Rect rect, string text, GUIStyle style, GUIStyle cancelButto
             text = EditorGUI.TextFieldInternal(m_ControlID, textRect, text, style);
 
             GUI.Button(buttonRect, GUIContent.none,
-                text != "" ? cancelButtonStyle : emptyCancelButtonStyle);
+                !string.IsNullOrEmpty(text) ? cancelButtonStyle : emptyCancelButtonStyle);
             return text;
         }