Unity 6000.0.13f1 C# reference source code

Author: Unity Technologies

Editor/Mono/Animation/AnimationWindow/AnimationWindowControl.cs

@@ -129,7 +129,6 @@ private static bool HasFlag(ResampleFlags flags, ResampleFlags flag)
         private AnimationClipPlayable m_CandidateClipPlayable;
         private AnimationClipPlayable m_DefaultPosePlayable;
         private bool m_UsesPostProcessComponents = false;
-        HashSet<Object> m_ObjectsModifiedDuringAnimationMode = new HashSet<Object>();
 
         private static ProfilerMarker s_ResampleAnimationMarker = new ProfilerMarker("AnimationWindowControl.ResampleAnimation");
 
@@ -717,42 +716,30 @@ private bool AllowRecordingPrefabPropertyOverridesFor(UnityEngine.Object compone
             if (componentOrGameObject == null)
                 throw new ArgumentNullException(nameof(componentOrGameObject));
 
-            GameObject inputGameObject = null;
-            if (componentOrGameObject is Component)
-            {
-                inputGameObject = ((Component)componentOrGameObject).gameObject;
-            }
-            else if (componentOrGameObject is GameObject)
-            {
-                inputGameObject = (GameObject)componentOrGameObject;
-            }
-            else
-            {
+            if (componentOrGameObject is not Component && componentOrGameObject is not GameObject)
                 return true;
-            }
 
             var rootOfAnimation = state.activeRootGameObject;
             if (rootOfAnimation == null)
                 return true;
 
-            // If the input object is a child of the current root of animation then disallow recording of prefab property overrides
-            // since the input object is currently being setup for animation recording
-            return inputGameObject.transform.IsChildOf(rootOfAnimation.transform) == false;
+            return false;
         }
 
         void OnExitingAnimationMode()
         {
             Undo.postprocessModifications -= PostprocessAnimationRecordingModifications;
             PrefabUtility.allowRecordingPrefabPropertyOverridesFor -= AllowRecordingPrefabPropertyOverridesFor;
+        }
 
-            // Ensures Prefab instance overrides are recorded for properties that was changed while in AnimationMode
-            foreach (var obj in m_ObjectsModifiedDuringAnimationMode)
+        void RecordPropertyOverridesForNonAnimatedProperties(UndoPropertyModification[] modifications)
+        {
+            PrefabUtility.allowRecordingPrefabPropertyOverridesFor -= AllowRecordingPrefabPropertyOverridesFor;
+            foreach (var mod in modifications)
             {
-                if (obj != null)
-                    EditorUtility.SetDirty(obj);
+                PrefabUtility.RecordPrefabInstancePropertyModifications(mod.currentValue.target);
             }
-
-            m_ObjectsModifiedDuringAnimationMode.Clear();
+            PrefabUtility.allowRecordingPrefabPropertyOverridesFor += AllowRecordingPrefabPropertyOverridesFor;
         }
 
         private UndoPropertyModification[] PostprocessAnimationRecordingModifications(UndoPropertyModification[] modifications)
@@ -769,17 +756,15 @@ private UndoPropertyModification[] PostprocessAnimationRecordingModifications(Un
             else if (previewing)
                 modifications = RegisterCandidates(modifications);
 
+            // Fix for UUM-61742: Unrecorded Prefab overloads should be recorded immediately
+            RecordPropertyOverridesForNonAnimatedProperties(modifications);
+
             RefreshDisplayNamesOnArrayTopologicalChange(modifications);
 
             // Only resample when playable graph has been customized with post process nodes.
             if (m_UsesPostProcessComponents)
                 ResampleAnimation(ResampleFlags.None);
 
-            foreach (var mod in modifications)
-            {
-                m_ObjectsModifiedDuringAnimationMode.Add(mod.currentValue.target);
-            }
-
             return modifications;
         }
 

Editor/Mono/AssemblyInfo/AssemblyInfo.cs

@@ -45,6 +45,7 @@
 [assembly: InternalsVisibleTo("UnityEditor.Graphs")]
 [assembly: InternalsVisibleTo("UnityEditor.UWP.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.iOS.Extensions.Common")]
+[assembly: InternalsVisibleTo("UnityEditor.Apple.Extensions.Common")]
 [assembly: InternalsVisibleTo("UnityEditor.iOS.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.VisionOS.Extensions")]
 [assembly: InternalsVisibleTo("UnityEditor.AppleTV.Extensions")]

Editor/Mono/AssetStoreCachePathManager.cs

@@ -19,7 +19,7 @@ public enum ConfigStatus
             InvalidPath,
             ReadOnly,
             EnvironmentOverride,
-            NotFound,
+            Default,
             Failed
         };
 

Editor/Mono/ConsoleWindow.cs

@@ -156,7 +156,6 @@ internal static void UpdateLogStyleFixedHeights()
         ListViewState m_ListView;
         string m_ActiveText = "";
         StringBuilder m_CopyString;
-        private int m_LastPingedEntryRow = -1;
         bool m_DevBuild;
         int m_CallstackTextStart = 0;
         private Mode m_ActiveMode = Mode.None;
@@ -457,18 +456,11 @@ void SetActiveEntry(LogEntry entry)
                 m_CallstackTextStart = entry.callstackTextStartUTF16;
                 var entryRow = LogEntries.GetEntryRowIndex(entry.globalLineIndex, m_IndexHintCache);
                 m_IndexHintCache = entryRow;
-                // ping object referred by the log entry
-                if (entry.instanceID != 0 && m_LastPingedEntryRow != entryRow)
-                {
-                    EditorGUIUtility.PingObject(entry.instanceID);
-                    m_LastPingedEntryRow = entryRow;
-                }
             }
             else
             {
                 m_CallstackTextStart = 0;
                 m_ActiveText = string.Empty;
-                m_LastPingedEntryRow = -1;
                 m_ListView.row = -1;
                 m_CopyString.Clear();
                 m_ActiveMode = Mode.None;
@@ -637,8 +629,9 @@ internal void OnGUI()
                             selectedRow = m_ListView.row;
                             DestroyLatestRestoreEntry();
                             LogEntry entry = new LogEntry();
-                            LogEntries.GetEntryInternal(m_ListView.row, entry);
-                            m_LastActiveEntryIndex = entry.globalLineIndex;
+                            LogEntries.GetEntryInternal(el.row, entry);
+                            if (entry.instanceID != 0 && e.clickCount != 2)
+                                EditorGUIUtility.PingObject(entry.instanceID);
                             if (e.clickCount == 2)
                                 openSelectedItem = true;
                         }

Editor/Mono/EditorGUI.cs

@@ -6483,7 +6483,7 @@ internal static bool FoldoutInternal(Rect position, bool foldout, GUIContent con
                     // in the Inspector has different values. Don't show it when expanded, since the difference will be visible further down.
                     if (showMixedValue && !foldout)
                     {
-                        style.Draw(drawRect, content, id, false);
+                        style.Draw(drawRect, content, id, false, false);
 
                         BeginHandleMixedValueContentColor();
                         Rect fieldPosition = origPosition;
@@ -6493,7 +6493,7 @@ internal static bool FoldoutInternal(Rect position, bool foldout, GUIContent con
                     }
                     else
                     {
-                        style.Draw(drawRect, content, id, foldout);
+                        style.Draw(drawRect, content, id, foldout, false);
                     }
                     break;
                 case EventType.KeyDown:

Editor/Mono/GUI/DockArea.cs

@@ -37,6 +37,8 @@ private static class Styles
             public static readonly GUIStyle background = "dockarea";
             public static readonly float tabMinWidth = tab.GetFloat(StyleCatalogKeyword.minWidth, 50.0f);
             public static readonly float tabMaxWidth = tab.GetFloat(StyleCatalogKeyword.maxWidth, 150.0f);
+            public static readonly float tabWidthPadding = tab.GetFloat(StyleCatalogKeyword.paddingRight);
+
             public static readonly float tabDragWidth = EditorResources.GetStyle("tab-drag").GetFloat(StyleCatalogKeyword.width, 100.0f);
 
             public static readonly GUIStyle tabScrollerPrevButton = new GUIStyle("dragtab scroller prev");
@@ -723,10 +725,9 @@ void AddTabToHere(object userData)
 
         private float GetTabWidth(GUIStyle tabStyle, EditorWindow tabWindow)
         {
-            var expectedWidth = tabStyle.CalcSize(tabWindow.titleContent).x;
-
-            return Mathf.Max(Mathf.Min(expectedWidth, Styles.tabMaxWidth),
-                Styles.tabMinWidth);
+            float minWidth, expectedWidth;
+            tabStyle.CalcMinMaxWidth(tabWindow.titleContent, out minWidth, out expectedWidth);
+            return Mathf.Max(Mathf.Min(expectedWidth, Styles.tabMaxWidth), Styles.tabMinWidth) + Styles.tabWidthPadding;
         }
 
         private float GetTabWidth(GUIStyle tabStyle, int tabIndex)

Editor/Mono/ImportSettings/TextureImporterInspector.cs

@@ -659,7 +659,11 @@ void InitializeGUI()
         public override void OnEnable()
         {
             base.OnEnable();
+            Initialize();
+        }
 
+        void Initialize()
+        {
             s_DefaultPlatformName = TextureImporter.defaultPlatformName; // Can't be called everywhere so we save it here for later use.
 
             m_ShowAdvanced = EditorPrefs.GetBool("TextureImporterShowAdvanced", m_ShowAdvanced);
@@ -1501,6 +1505,7 @@ void TextureSettingsGUI()
             }
         }
 
+
         public override void OnInspectorGUI()
         {
             serializedObject.Update();
@@ -1818,6 +1823,12 @@ public override void DrawPreview(Rect previewArea)
                 VirtualTexturing.System.Update();
         }
 
+        internal override void PostSerializedObjectCreation()
+        {
+            base.PostSerializedObjectCreation();
+            Initialize();
+        }
+
         private void RefreshPreviewChannelSelection()
         {
             //If the Preview is null or NOT the TextureInspector (e.g. ObjectPreview) then return, we do not need to refresh the preview channel selection

Editor/Mono/Inspector/Core/ScriptAttributeGUI/PropertyHandler.cs

@@ -117,7 +117,7 @@ public void HandleDrawnType(SerializedProperty property, Type drawnType, Type pr
                     // Use PropertyDrawer on array elements, not on array itself.
                     // If there's a PropertyAttribute on an array, we want to apply it to the individual array elements instead.
                     // This is the only convenient way we can let the user apply PropertyDrawer attributes to elements inside an array.
-                    if (propertyType != null && propertyType.IsArrayOrList() && !attribute.applyToCollection)
+                    if (propertyType != null && propertyType.IsArrayOrList() && (attribute == null || !attribute.applyToCollection))
                         return;
 
                     var propertyDrawerForType = CreatePropertyDrawerWithDefaultObjectReferences(drawerType);

Editor/Mono/Inspector/MinMaxCurvePropertyDrawer.cs

@@ -236,7 +236,6 @@ static void DoMinMaxCurvesField(Rect position, int id, SerializedProperty proper
         public override VisualElement CreatePropertyGUI(SerializedProperty property)
         {
             const string StylesheetPath = "StyleSheets/ParticleSystem/ParticleSystem.uss";
-            const string HideClass = "unity-hidden";
             const string AlignClass = "unity-base-field__aligned";
             const string InputClass = "unity-base-popup-field__input";
             const string RowClass = "unity-particle-system-min-max-curve__row";
@@ -245,7 +244,7 @@ public override VisualElement CreatePropertyGUI(SerializedProperty property)
             PropertyField PrepareProperty(SerializedProperty prop, string label, VisualElement parent)
             {
                 var propField = new PropertyField(prop, label);
-                propField.AddToClassList(HideClass);
+                propField.AddToClassList(UIElementsUtility.hiddenClassName);
                 propField.AddToClassList(GrowClass);
                 parent.Add(propField);
                 return propField;
@@ -273,7 +272,7 @@ PropertyField PrepareProperty(SerializedProperty prop, string label, VisualEleme
                 else DoMinMaxCurvesField(rect, m_Property.curveMin.GetHashCode(), m_Property.curveMax, m_Property.curveMin, m_Property.curveMultiplier, s_Styles.curveColor, s_Styles.curveBackgroundColor, xAxisLabel);
                 if (EditorGUI.EndChangeCheck()) m_Property.curveMax.serializedObject.ApplyModifiedProperties();
             });
-            region.AddToClassList(HideClass);
+            region.AddToClassList(UIElementsUtility.hiddenClassName);
             region.AddToClassList(GrowClass);
             container.Add(region);
 
@@ -286,7 +285,7 @@ PropertyField PrepareProperty(SerializedProperty prop, string label, VisualEleme
                 m_Property.mode.intValue = (int)state;
                 m_Property.mode.serializedObject.ApplyModifiedProperties();
 
-                constantMax.EnableInClassList(HideClass, state != MinMaxCurveState.k_Scalar && state != MinMaxCurveState.k_TwoScalars);
+                constantMax.EnableInClassList(UIElementsUtility.hiddenClassName, state != MinMaxCurveState.k_Scalar && state != MinMaxCurveState.k_TwoScalars);
 
                 if(constantMax.Children().Count() > 0)
                 {
@@ -305,8 +304,8 @@ PropertyField PrepareProperty(SerializedProperty prop, string label, VisualEleme
                     }
                 }
 
-                constantMin.EnableInClassList(HideClass, state != MinMaxCurveState.k_TwoScalars);
-                region.EnableInClassList(HideClass, state != MinMaxCurveState.k_Curve && state != MinMaxCurveState.k_TwoCurves);
+                constantMin.EnableInClassList(UIElementsUtility.hiddenClassName, state != MinMaxCurveState.k_TwoScalars);
+                region.EnableInClassList(UIElementsUtility.hiddenClassName, state != MinMaxCurveState.k_Curve && state != MinMaxCurveState.k_TwoCurves);
                 AnimationCurvePreviewCache.ClearCache();
             };
             mode.RegisterValueChangedCallback(valueChangeAction);

Editor/Mono/Inspector/RectTransformEditor.cs

@@ -651,7 +651,8 @@ void Vector2Field(Rect position,
             SerializedProperty xProperty = vec2Property.FindPropertyRelative("x");
             SerializedProperty yProperty = vec2Property.FindPropertyRelative("y");
 
-            EditorGUI.PrefixLabel(position, -1, label);
+            int id = GUIUtility.GetControlID(label.GetHashCode(), FocusType.Keyboard, position);
+            EditorGUI.PrefixLabel(position, id, label);
             float t = EditorGUIUtility.labelWidth;
             int l = EditorGUI.indentLevel;
             Rect r0 = GetColumnRect(position, 0);