Unity 2022.2.0a17 C# reference source code

Author: Unity Technologies

Editor/Mono/BuildPipeline/DesktopStandalonePostProcessor.cs

@@ -38,7 +38,7 @@ public override void UpdateBootConfig(BuildTarget target, BootConfigData config,
         if (PlayerSettings.forceSingleInstance)
             config.AddKey("single-instance");
         if (!PlayerSettings.useFlipModelSwapchain)
-            config.AddKey("force-d3d11-bitblt-mode");
+            config.AddKey("force-d3d11-bitblt-model");
         if (IL2CPPUtils.UseIl2CppCodegenWithMonoBackend(NamedBuildTarget.FromActiveSettings(target)))
             config.Set("mono-codegen", "il2cpp");
         if ((options & BuildOptions.EnableCodeCoverage) != 0)

Editor/Mono/EditorApplication.bindings.cs

@@ -3,6 +3,7 @@
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
 using System;
+using System.Reflection;
 using UnityEditor.Scripting.ScriptCompilation;
 using UnityEngine;
 using UnityEngine.Bindings;
@@ -168,28 +169,55 @@ public static bool ExecuteMenuItem(string menuItemPath)
             var isDefaultMode = ModeService.currentId == ModeService.k_DefaultModeId;
             var result = ExecuteMenuItemInternal(sanitizedPath, isDefaultMode);
             if (result)
-                return result;
+                return true;
 
             if (!isDefaultMode)
             {
+                // Check if the menu was found first. If so, it means that the menu just
+                // didn't pass validation. No need to check further.
+                if (Menu.MenuItemExists(sanitizedPath))
+                    return false;
+
                 var menuItems = TypeCache.GetMethodsWithAttribute<MenuItem>();
+                MethodInfo validateItem = null;
+                MethodInfo executeItem = null;
                 foreach (var item in menuItems)
                 {
                     MenuItem itemData = (MenuItem)item.GetCustomAttributes(typeof(MenuItem), false)[0];
-                    if (!itemData.validate && itemData.menuItem == sanitizedPath)
+                    var hotKeyIndex = Menu.FindHotkeyStartIndex(itemData.menuItem);
+                    var hasHotkey = hotKeyIndex != -1 && hotKeyIndex != itemData.menuItem.Length;
+                    bool matches;
+                    if (!hasHotkey)
                     {
-                        if (item.GetParameters().Length == 0)
-                        {
-                            item.Invoke(null, new object[0]);
-                            return true;
-                        }
-                        else if (item.GetParameters()[0].ParameterType == typeof(MenuCommand))
-                        {
-                            item.Invoke(null, new[] { new MenuCommand(null) });
-                            return true;
-                        }
-                        break;
+                        matches = itemData.menuItem == sanitizedPath;
+                    }
+                    else
+                    {
+                        var stringView = itemData.menuItem.AsSpan(0, hotKeyIndex);
+                        stringView = stringView.TrimEnd();
+                        matches = stringView == sanitizedPath;
                     }
+                    if (!matches)
+                        continue;
+
+                    if (itemData.validate)
+                        validateItem = item;
+                    else
+                        executeItem = item;
+
+                    if (validateItem != null && executeItem != null)
+                        break;
+                }
+
+                if (validateItem != null)
+                {
+                    if (!ExecuteMenuItem(validateItem, true))
+                        return false;
+                }
+
+                if (executeItem != null)
+                {
+                    return ExecuteMenuItem(executeItem, false);
                 }
 
                 Debug.LogError($"ExecuteMenuItem failed because there is no menu named '{menuItemPath}'");
@@ -198,6 +226,22 @@ public static bool ExecuteMenuItem(string menuItemPath)
             return false;
         }
 
+        static bool ExecuteMenuItem(MethodInfo menuMethodInfo, bool validate)
+        {
+            if (menuMethodInfo.GetParameters().Length == 0)
+            {
+                var result = menuMethodInfo.Invoke(null, new object[0]);
+                return !validate || (bool)result;
+            }
+
+            if (menuMethodInfo.GetParameters()[0].ParameterType == typeof(MenuCommand))
+            {
+                var result = menuMethodInfo.Invoke(null, new[] { new MenuCommand(null) });
+                return !validate || (bool)result;
+            }
+            return false;
+        }
+
         // Validates the menu item in the specific path
         internal static extern bool ValidateMenuItem(string menuItemPath);
 

Editor/Mono/EditorGUI.cs

@@ -2782,7 +2782,7 @@ internal static int DelayedIntFieldInternal(Rect position, GUIContent label, int
             bool draggable = SetDelayedDraggable(ref position, ref dragHotzone, label, id);
 
             BeginChangeCheck();
-            DelayedNumberFieldInternal(position, dragHotzone, id, false, ref dummy, ref longValue, kFloatFieldFormatString, style, draggable, Event.current.GetTypeForControl(id) == EventType.MouseDown ? (float)NumericFieldDraggerUtility.CalculateFloatDragSensitivity(s_DragStartValue) : 0.0f);
+            DelayedNumberFieldInternal(position, dragHotzone, id, false, ref dummy, ref longValue, kIntFieldFormatString, style, draggable, Event.current.GetTypeForControl(id) == EventType.MouseDown ? (float)NumericFieldDraggerUtility.CalculateIntDragSensitivity(value) : 0.0f);
             if (EndChangeCheck())
             {
                 if ((int)longValue != value)

Editor/Mono/EditorGUIUtility.cs

@@ -17,6 +17,7 @@
 using UnityEngineInternal;
 using UnityEditor.StyleSheets;
 using UnityEditor.Experimental;
+using UnityEditor.SceneManagement;
 using UnityEngine.UIElements;
 using UnityObject = UnityEngine.Object;
 
@@ -118,6 +119,9 @@ internal static Material GUITextureBlitSceneGUIMaterial
         private static readonly GUIContent s_Image = new GUIContent();
         private static readonly GUIContent s_TextImage = new GUIContent();
 
+        private static GUIContent s_SceneMismatch = TrTextContent("Scene mismatch (cross scene references not supported)");
+        private static GUIContent s_TypeMismatch = TrTextContent("Type mismatch");
+
         internal static readonly SVC<Color> kViewBackgroundColor = new SVC<Color>("view", StyleCatalogKeyword.backgroundColor, GetDefaultBackgroundColor);
 
         /// The current UI scaling factor for high-DPI displays. For instance, 2.0 on a retina display
@@ -976,6 +980,54 @@ internal static GUIContent ObjectContent(UnityObject obj, Type type, int instanc
             return s_ObjectContent;
         }
 
+        internal static GUIContent ObjectContent(UnityObject obj, Type type, SerializedProperty property, EditorGUI.ObjectFieldValidator validator = null)
+        {
+            if (validator == null)
+                validator = EditorGUI.ValidateObjectFieldAssignment;
+
+            GUIContent temp;
+
+            // If obj or objType are both null, we have to rely on
+            // property.objectReferenceStringValue to display None/Missing and the
+            // correct type. But if not, EditorGUIUtility.ObjectContent is more reliable.
+            // It can take a more specific object type specified as argument into account,
+            // and it gets the icon at the same time.
+            if (obj == null && type == null && property != null)
+            {
+                temp = TempContent(property.objectReferenceStringValue);
+            }
+            else
+            {
+                // In order for ObjectContext to be able to distinguish between None/Missing,
+                // we need to supply an instanceID. For some reason, getting the instanceID
+                // from property.objectReferenceValue is not reliable, so we have to
+                // explicitly check property.objectReferenceInstanceIDValue if a property exists.
+                if (property != null)
+                    temp = ObjectContent(obj, type, property.objectReferenceInstanceIDValue);
+                else
+                    temp = ObjectContent(obj, type);
+            }
+
+            if (property != null)
+            {
+                if (obj != null)
+                {
+                    UnityObject[] references = { obj };
+                    if (EditorSceneManager.preventCrossSceneReferences && EditorGUI.CheckForCrossSceneReferencing(obj, property.serializedObject.targetObject))
+                    {
+                        if (!EditorApplication.isPlaying)
+                            temp = s_SceneMismatch;
+                        else
+                            temp.text = temp.text + string.Format(" ({0})", EditorGUI.GetGameObjectFromObject(obj).scene.name);
+                    }
+                    else if (validator(references, type, property, EditorGUI.ObjectFieldValidatorOptions.ExactObjectTypeValidation) == null)
+                        temp = s_TypeMismatch;
+                }
+            }
+
+            return temp;
+        }
+
         internal static GUIContent TempContent(string t)
         {
             s_Text.image = null;

Editor/Mono/GUI/GradientEditor.cs

@@ -180,11 +180,8 @@ public void OnGUI(Rect position)
 
             // Gradient texture
             position.y += swatchHeight;
-            if (Event.current.type == EventType.Repaint)
-            {
-                position.height = gradientTextureHeight;
-                DrawGradientWithBackground(position, m_Gradient, m_ColorSpace == ColorSpace.Linear);
-            }
+            position.height = gradientTextureHeight;
+            DrawGradientWithBackground(position, m_Gradient, m_ColorSpace == ColorSpace.Linear);
             position.y += gradientTextureHeight;
             position.height = swatchHeight;
 

Editor/Mono/GUI/MaskFieldGUI.cs

@@ -115,7 +115,7 @@ internal static int DoMaskField(Rect position, int controlID, int mask, string[]
         {
             mask = MaskCallbackInfo.GetSelectedValueForControl(controlID, mask, out changedFlags, out changedToValue);
 
-            GetMenuOptions(mask, flagNames, flagValues, out var buttonText, out var buttonTextMixed, out var optionNames, out var optionMaskValues, out var selectedOptions, enumType);
+            GetMenuOptions(mask, flagNames, flagValues, out var buttonText, out var buttonTextMixed, out var optionNames, out var optionMaskValues, out _, enumType);
 
             Event evt = Event.current;
             if (evt.type == EventType.Repaint)
@@ -126,7 +126,7 @@ internal static int DoMaskField(Rect position, int controlID, int mask, string[]
             else if ((evt.type == EventType.MouseDown && position.Contains(evt.mousePosition)) || evt.MainActionKeyForControl(controlID))
             {
                 MaskCallbackInfo.m_Instance = new MaskCallbackInfo(controlID);
-                PopupWindowWithoutFocus.Show(position, new MaskFieldDropDown(optionNames, optionMaskValues, mask, MaskCallbackInfo.m_Instance.SetMaskValueDelegate));
+                PopupWindowWithoutFocus.Show(position, new MaskFieldDropDown(optionNames, flagValues, optionMaskValues, mask, MaskCallbackInfo.m_Instance.SetMaskValueDelegate));
             }
 
             return mask;
@@ -349,10 +349,6 @@ internal static void GetMenuOptions(int mask, string[] flagNames, int[] flagValu
                 var flagSet = ((intermediateMask & flagValue) == flagValue);
                 var newMask = (flagSet ? intermediateMask & ~flagValue : intermediateMask | flagValue);
 
-                // If all flag options are selected the mask becomes everythingValue to be consistent with the "Everything" option
-                if (newMask == flagMask)
-                    newMask = everythingValue;
-
                 optionMaskValues[optionIndex] = newMask;
             }
         }

Editor/Mono/GUI/ObjectField.cs

@@ -410,43 +410,7 @@ static Object DoObjectField(Rect position, Rect dropRect, int id, Object obj, Ob
                     }
                     else
                     {
-                        // If obj or objType are both null, we have to rely on
-                        // property.objectReferenceStringValue to display None/Missing and the
-                        // correct type. But if not, EditorGUIUtility.ObjectContent is more reliable.
-                        // It can take a more specific object type specified as argument into account,
-                        // and it gets the icon at the same time.
-                        if (obj == null && objType == null && property != null)
-                        {
-                            temp = EditorGUIUtility.TempContent(property.objectReferenceStringValue);
-                        }
-                        else
-                        {
-                            // In order for ObjectContext to be able to distinguish between None/Missing,
-                            // we need to supply an instanceID. For some reason, getting the instanceID
-                            // from property.objectReferenceValue is not reliable, so we have to
-                            // explicitly check property.objectReferenceInstanceIDValue if a property exists.
-                            if (property != null)
-                                temp = EditorGUIUtility.ObjectContent(obj, objType, property.objectReferenceInstanceIDValue);
-                            else
-                                temp = EditorGUIUtility.ObjectContent(obj, objType);
-                        }
-
-                        if (property != null)
-                        {
-                            if (obj != null)
-                            {
-                                Object[] references = { obj };
-                                if (EditorSceneManager.preventCrossSceneReferences && CheckForCrossSceneReferencing(obj, property.serializedObject.targetObject))
-                                {
-                                    if (!EditorApplication.isPlaying)
-                                        temp = s_SceneMismatch;
-                                    else
-                                        temp.text = temp.text + string.Format(" ({0})", GetGameObjectFromObject(obj).scene.name);
-                                }
-                                else if (validator(references, objType, property, ObjectFieldValidatorOptions.ExactObjectTypeValidation) == null)
-                                    temp = s_TypeMismatch;
-                            }
-                        }
+                        temp = EditorGUIUtility.ObjectContent(obj, objType, property, validator);
                     }
 
                     switch (visualType)

Editor/Mono/GUI/ReorderableList.cs

@@ -140,6 +140,19 @@ bool CheckForChildInvalidation()
             return false;
         }
 
+        internal void InvalidateForGUI()
+        {
+            if (!m_SerializedObject?.isEditingMultipleObjects ?? true)
+            {
+                InvalidateCache();
+            }
+            else
+            {
+                InvalidateExistingListCaches();
+                EditorApplication.delayCall += InspectorWindow.RefreshInspectors;
+            }
+        }
+
         // class for default rendering and behavior of reorderable list - stores styles and is statically available as s_Defaults
         public class Defaults
         {
@@ -160,7 +173,7 @@ public class Defaults
             internal const int minHeaderHeight = 2;
             const float elementPadding = 2;
             private int ArrayCountInPropertyPath(SerializedProperty prop) => Regex.Matches(prop.propertyPath, ".Array.data").Count;
-            private float FieldLabelSize(Rect r, SerializedProperty prop) => r.xMax * 0.45f - 35 - prop.depth * 15 - ArrayCountInPropertyPath(prop) * 10;
+            private float FieldLabelSize(Rect r, SerializedProperty prop) => r.width * 0.45f - 20 - ArrayCountInPropertyPath(prop) * 22 + (prop.depth < 2 ? 7 : 0);
             private static readonly GUIContent s_ListIsEmpty = EditorGUIUtility.TrTextContent("List is Empty");
             internal static readonly string undoAdd = "Add Element To Array";
             internal static readonly string undoRemove = "Remove Element From Array";
@@ -279,7 +292,7 @@ internal void DoAddButton(ReorderableList list, Object value)
                         Debug.LogError("Cannot add element of type Null.");
                 }
                 Undo.SetCurrentGroupName(undoAdd);
-                list.InvalidateCache();
+                list.InvalidateForGUI();
             }
 
             public void DoAddButton(ReorderableList list)
@@ -323,7 +336,7 @@ public void DoRemoveButton(ReorderableList list)
                 }
                 list.index = Mathf.Clamp(lastDeletedIndex - 1, 0, list.count - 1);
                 Undo.SetCurrentGroupName(undoRemove);
-                list.InvalidateCache();
+                list.InvalidateForGUI();
             }
 
             // draw the default header background

Editor/Mono/GameObjectUtility.bindings.cs

@@ -103,6 +103,23 @@ public static void SetParentAndAlign(GameObject child, GameObject parent)
             SetLayerRecursively(child, parent.layer);
         }
 
+        internal static void SetDefaultParentForNewObject(GameObject gameObject, Transform parent = null, bool align = false)
+        {
+            if (parent == null && (parent = SceneView.GetDefaultParentObjectIfSet()) == null)
+            {
+                return;
+            }
+
+            if(align)
+            {
+                GameObjectUtility.SetParentAndAlign(gameObject, parent?.gameObject);
+            }
+            else
+            {
+                gameObject.transform.SetParent(parent);
+            }
+        }
+
         private static void SetLayerRecursively(GameObject go, int layer)
         {
             go.layer = layer;

Editor/Mono/Inspector/BlendTreeInspector.cs

@@ -1664,7 +1664,7 @@ private void ComputeProperty(GetFloatFromMotion func, ChildPropertyToCompute pro
 
             if (variance < Mathf.Epsilon)
             {
-                Debug.LogWarning("Could not compute threshold for '" + m_BlendTree.name + "' there is not enough data");
+                Debug.LogWarning($"Can't distribute the motions of '{m_BlendTree.name}', they all have the same threshold value.");
                 m_SerializedObject.Update();
             }
             else