Unity 2021.2.0a6 C# reference source code

Author: Unity Technologies

Editor/Mono/Annotation/AnnotationWindow.cs

@@ -4,6 +4,7 @@
 
 using UnityEngine;
 using System.Collections.Generic;
+using UnityEditor.ShortcutManagement;
 
 namespace UnityEditor
 {
@@ -702,6 +703,18 @@ void SetGizmoState(AInfo ainfo, bool addToMostRecentChanged = true)
             AnnotationUtility.SetGizmoEnabled(ainfo.m_ClassID, ainfo.m_ScriptClass, ainfo.m_GizmoEnabled ? 1 : 0, addToMostRecentChanged);
             SceneView.RepaintAll();
         }
+
+        [Shortcut("Scene View/Toggle Selection Outline", typeof(SceneView))]
+        static void ToggleSelectionOutline()
+        {
+            AnnotationUtility.showSelectionOutline = !AnnotationUtility.showSelectionOutline;
+        }
+
+        [Shortcut("Scene View/Toggle Selection Wireframe", typeof(SceneView))]
+        static void ToggleSelectionWireframe()
+        {
+            AnnotationUtility.showSelectionWire = !AnnotationUtility.showSelectionWire;
+        }
     }
 
     internal class AInfo : System.IComparable, System.IEquatable<AInfo>

Editor/Mono/AssetModificationProcessor.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Scripting;
 using UnityEditor.VersionControl;
 using UnityEditorInternal;
 using UnityEditorInternal.VersionControl;
@@ -94,6 +95,7 @@ static System.Collections.Generic.IEnumerable<System.Type> AssetModificationProc
         }
 #pragma warning restore 0618
 
+        [RequiredByNativeCode]
         static void OnWillCreateAsset(string path)
         {
             foreach (var assetModificationProcessorClass in AssetModificationProcessors)
@@ -129,6 +131,7 @@ static void FileModeChanged(string[] assets, FileMode mode)
 
         // Postprocess on all assets once an automatic import has completed
         // ReSharper disable once UnusedMember.Local - invoked from native code
+        [RequiredByNativeCode]
         static void OnWillSaveAssets(string[] assets, out string[] assetsThatShouldBeSaved, out string[] assetsThatShouldBeReverted, bool explicitlySaveAsset)
         {
             assetsThatShouldBeReverted = new string[0];
@@ -375,7 +378,7 @@ static Editability GetPathEditability(string assetPath)
                 return Editability.Never;
 
             // other paths that are not know to asset database, and not versioned, are considered always editable
-            if (!Provider.PathIsVersioned(assetPath))
+            if (!VersionControlUtils.IsPathVersioned(assetPath))
                 return Editability.Always;
 
             return Editability.Maybe;

Editor/Mono/BuildTarget.cs

@@ -124,7 +124,9 @@ public enum BuildTarget
 
         CloudRendering = 41,
 
+        [System.Obsolete("GameCoreScarlett is deprecated, please use GameCoreXboxSeries (UnityUpgradable) -> GameCoreXboxSeries", false)]
         GameCoreScarlett = 42,
+        GameCoreXboxSeries = 42, // GameCoreXboxSeries intentionally set to the same as GameCoreScarlett
         GameCoreXboxOne = 43,
 
         PS5 = 44,

Editor/Mono/BuildTargetConverter.cs

@@ -42,8 +42,8 @@ internal static class BuildTargetConverter
                     return RuntimePlatform.WebGLPlayer;
                 case BuildTarget.Lumin:
                     return RuntimePlatform.Lumin;
-                case BuildTarget.GameCoreScarlett:
-                    return RuntimePlatform.GameCoreScarlett;
+                case BuildTarget.GameCoreXboxSeries:
+                    return RuntimePlatform.GameCoreXboxSeries;
                 case BuildTarget.GameCoreXboxOne:
                     return RuntimePlatform.GameCoreXboxOne;
                 default:

Editor/Mono/BuildTargetGroup.cs

@@ -101,7 +101,9 @@ public enum BuildTargetGroup
 
         CloudRendering = 30,
 
+        [System.Obsolete("GameCoreScarlett is deprecated, please use GameCoreXboxSeries (UnityUpgradable) -> GameCoreXboxSeries", false)]
         GameCoreScarlett = 31,
+        GameCoreXboxSeries = 31, // GameCoreXboxSeries intentionally set to the same as GameCoreScarlett
         GameCoreXboxOne = 32,
 
         PS5 = 33,

Editor/Mono/EditorApplication.cs

@@ -13,6 +13,7 @@
 using UnityEditor.Scripting;
 using UnityEngine.TestTools;
 using Unity.Profiling;
+using UnityEditor.VersionControl;
 using UnityEngine.Profiling;
 
 namespace UnityEditor
@@ -114,6 +115,10 @@ static bool Internal_EditorApplicationWantsToQuit()
 
         static void Internal_EditorApplicationQuit()
         {
+            // VersionControlObject might depend on packages that cleanup themselves using quitting event.
+            // Therefore it's important to deactivate it beforehand.
+            VersionControlManager.Deactivate();
+
             quitting?.Invoke();
             editorApplicationQuit?.Invoke();
             ScriptCompilers.Cleanup();

Editor/Mono/EditorGUI.cs

@@ -2830,7 +2830,7 @@ internal static GenericMenu FillPropertyContextMenu(SerializedProperty property,
             // If property is a reference and we're using VCS, add item to check it out
             // This menu is not excluded when the field is disabled
             // because it is nice to get information about the property even when it's disabled.
-            if (propertyWithPath.propertyType == SerializedPropertyType.ObjectReference && Provider.isActive)
+            if (propertyWithPath.propertyType == SerializedPropertyType.ObjectReference && VersionControlUtils.isVersionControlConnected)
             {
                 var obj = propertyWithPath.objectReferenceValue;
                 if (obj != null && !AssetDatabase.IsOpenForEdit(obj))

Editor/Mono/EditorHandles/Slider1D.cs

@@ -13,6 +13,7 @@ internal class Slider1D
         // Used for plane intersection translation
         static Vector3 s_ConstraintOrigin, s_ConstraintDirection, s_HandleOffset;
         static float s_StartHandleSize;
+        static Matrix4x4 s_StartInverseHandleMatrix;
 
         // Used for 2D translation (fallback when ray plane intersection fails)
         static Vector2 s_StartMousePosition;
@@ -60,6 +61,7 @@ internal static Vector3 Do(int id, Vector3 position, Vector3 offset, Vector3 han
                             : Vector3.zero;
                         evt.Use();
                         s_StartHandleSize = HandleUtility.GetHandleSize(point);
+                        s_StartInverseHandleMatrix = Handles.inverseMatrix;
                     }
 
                     break;
@@ -91,7 +93,8 @@ internal static Vector3 Do(int id, Vector3 position, Vector3 offset, Vector3 han
                                 worldPosition = Snapping.Snap(worldPosition, GridSettings.size, (SnapAxis) new SnapAxisFilter(s_ConstraintDirection));
                             }
 
-                            position = Handles.inverseMatrix.MultiplyPoint(worldPosition);
+                            position = s_StartInverseHandleMatrix.MultiplyPoint(worldPosition);
+
                             s_StartPosition = position;
                             s_StartMousePosition = evt.mousePosition;
                         }

Editor/Mono/EditorUserSettings.bindings.cs

@@ -53,10 +53,10 @@ public static string GetConfigValue(string name)
         public static extern bool overlayIcons { get; set; }
 
         [NativeProperty("VCHierarchyOverlayIcons")]
-        internal static extern bool hierarchyOverlayIcons { get; set; }
+        public static extern bool hierarchyOverlayIcons { get; set; }
 
         [NativeProperty("VCOtherOverlayIcons")]
-        internal static extern bool otherOverlayIcons { get; set; }
+        public static extern bool otherOverlayIcons { get; set; }
 
         [NativeProperty("VCAllowAsyncUpdate")]
         public static extern bool allowAsyncStatusUpdate { get; set; }

Editor/Mono/GUI/ReorderableList.cs

@@ -385,7 +385,12 @@ public void DrawElement(Rect rect, SerializedProperty element, System.Object lis
                     EditorGUIUtility.labelWidth = FieldLabelSize(rect, prop);
 
                     var handler = ScriptAttributeUtility.GetHandler(prop);
+                    EditorGUI.BeginChangeCheck();
                     handler.OnGUI(rect, prop, null, true);
+                    if (EditorGUI.EndChangeCheck())
+                    {
+                        prop.serializedObject.ApplyModifiedProperties();
+                    }
                     if (Event.current.type == EventType.MouseDown && Event.current.button == 1 && rect.Contains(Event.current.mousePosition)) Event.current.Use();
 
                     EditorGUIUtility.labelWidth = oldLabelWidth;