Unity 2023.1.0a6 C# reference source code

Author: Unity Technologies

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

@@ -58,6 +58,7 @@ class Styles
             public readonly GUIContent paddingLabel = EditorGUIUtility.TrTextContent("Padding", "The amount of extra padding between packed sprites.");
 
             public readonly GUIContent generateMipMapLabel = EditorGUIUtility.TrTextContent("Generate Mip Maps");
+            public readonly GUIContent packPreviewLabel = EditorGUIUtility.TrTextContent("Pack Preview", "Save and preview packed Sprite Atlas textures.");
             public readonly GUIContent sRGBLabel = EditorGUIUtility.TrTextContent("sRGB", "Texture content is stored in gamma space.");
             public readonly GUIContent readWrite = EditorGUIUtility.TrTextContent("Read/Write", "Enable to be able to access the raw pixel data from code.");
             public readonly GUIContent variantMultiplierLabel = EditorGUIUtility.TrTextContent("Scale", "Down scale ratio.");
@@ -152,6 +153,7 @@ private enum AtlasType { Undefined = -1, Master = 0, Variant = 1 }
 
         private float m_MipLevel = 0;
         private bool m_ShowAlpha;
+        private bool m_Discard = false;
 
         private List<string> m_PlatformSettingsOptions;
         private int m_SelectedPlatformSettings = 0;
@@ -406,7 +408,11 @@ protected override void Apply()
             if (HasModified())
             {
                 if (spriteAtlasAsset)
+                {
                     SpriteAtlasAsset.Save(spriteAtlasAsset, m_AssetPath);
+                    AssetDatabase.ImportAsset(m_AssetPath);
+                }
+
                 m_ContentHash = GetInspectorHash();
             }
             base.Apply();
@@ -424,7 +430,7 @@ protected void PackPreviewGUI()
                 {
                     GUILayout.FlexibleSpace();
 
-                    if (GUILayout.Button("Pack Preview"))
+                    if (GUILayout.Button(styles.packPreviewLabel))
                     {
                         GUI.FocusControl(null);
                         SpriteAtlasUtility.EnableV2Import(true);
@@ -445,7 +451,7 @@ private bool IsValidAtlas()
 
         public override bool HasModified()
         {
-            return base.HasModified() || m_ContentHash != GetInspectorHash();
+            return !m_Discard && (base.HasModified() || m_ContentHash != GetInspectorHash());
         }
 
         private void ValidateMasterAtlas()
@@ -829,6 +835,20 @@ private void HandlePackableListUI()
             }
         }
 
+        public override void SaveChanges()
+        {
+            if (!m_Discard)
+                base.SaveChanges();
+            m_ContentHash = GetInspectorHash();
+        }
+
+        public override void DiscardChanges()
+        {
+            m_Discard = true;
+            base.DiscardChanges();
+            m_ContentHash = GetInspectorHash();
+        }
+
         void CachePreviewTexture()
         {
             var spriteAtlas = AssetDatabase.LoadAssetAtPath<SpriteAtlas>(m_AssetPath);

Editor/Mono/BuildPipeline.bindings.cs

@@ -633,7 +633,7 @@ internal static AssetBundleManifest BuildAssetBundles(string outputPath, AssetBu
         private static extern AssetBundleManifest BuildAssetBundlesWithInfoInternal(string outputPath, AssetBundleBuild[] builds, BuildAssetBundleOptions assetBundleOptions, BuildTargetGroup targetPlatformGroup, BuildTarget targetPlatform, int subtarget);
 
         [FreeFunction("GetPlayerDataSessionId")]
-        internal static extern string GetSessionIdForBuildTarget(BuildTarget target);
+        internal static extern string GetSessionIdForBuildTarget(BuildTarget target, int subtarget);
 
         [FreeFunction("ExtractCRCFromAssetBundleManifestFile")]
         public static extern bool GetCRCForAssetBundle(string targetPath, out uint crc);

Editor/Mono/BuildPipelineExperimental.cs

@@ -2,13 +2,16 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
+using System;
+
 namespace UnityEditor.Experimental
 {
+    [Obsolete("BuildPipelineExperimental is no longer supported and will be removed")]
     public static class BuildPipelineExperimental
     {
         public static string GetSessionIdForBuildTarget(BuildTarget target)
         {
-            return BuildPipeline.GetSessionIdForBuildTarget(target);
+            return BuildPipeline.GetSessionIdForBuildTarget(target, 0);
         }
     }
 }

Editor/Mono/Display/EditorDisplayManager.cs

@@ -103,7 +103,7 @@ private void UpdateAssociatedPlayModeView()
                 m_views[i] = view;
                 if (view != null)
                 {
-                    EditorDisplayUtility.AddVirtualDisplay(i, (int)view.targetSize.x, (int)view.targetSize.y);
+                    EditorDisplayUtility.AddVirtualDisplay(i, Mathf.RoundToInt(view.targetSize.x), Mathf.RoundToInt(view.targetSize.y));
                 }
                 else
                 {

Editor/Mono/EditorAssemblies.bindings.cs

@@ -10,7 +10,7 @@
 
 namespace UnityEditor
 {
-    [NativeHeader("Runtime/Mono/MonoAttributeHelpers.h")]
+    [NativeHeader("Runtime/Scripting/TypeCache.h")]
     static partial class EditorAssemblies
     {
         const BindingFlags k_DefaultMethodBindingFlags =
@@ -27,31 +27,5 @@ internal static IEnumerable<MethodInfo> GetAllMethodsWithAttribute<T>(BindingFla
 
         [FreeFunction(Name = "GetAllMethodsWithAttribute")]
         extern static object[] Internal_GetAllMethodsWithAttribute(Type attrType, BindingFlags staticness);
-
-        [Obsolete("Use public TypeCache.GetTypesWithAttribute<> API instead.")]
-        internal static IEnumerable<Type> GetAllTypesWithAttribute<T>() where T : Attribute
-        {
-            return Internal_GetAllTypesWithAttribute(typeof(T));
-        }
-
-        [FreeFunction(Name = "GetAllTypesWithAttribute")]
-        extern static Type[] Internal_GetAllTypesWithAttribute(Type attrType);
-
-        [Obsolete("Use public TypeCache.GetTypesDerivedFrom<> API instead.")]
-        internal static IEnumerable<Type> GetAllTypesWithInterface<T>() where T : class
-        {
-            return GetAllTypesWithInterface(typeof(T));
-        }
-
-        [Obsolete("Use public TypeCache.GetTypesDerivedFrom<> API instead.")]
-        private static IEnumerable<Type> GetAllTypesWithInterface(Type interfaceType)
-        {
-            if (!interfaceType.IsInterface)
-                throw new ArgumentException(string.Format("Specified type {0} is not an interface.", interfaceType), nameof(interfaceType));
-            return Internal_GetAllTypesWithInterface(interfaceType);
-        }
-
-        [FreeFunction(Name = "GetAllTypesWithInterface")]
-        extern static Type[] Internal_GetAllTypesWithInterface(Type interfaceType);
     }
 }

Editor/Mono/EditorAssemblies.cs

@@ -70,32 +70,6 @@ static internal IEnumerable<Type> loadedTypes
             get { return loadedAssemblies.SelectMany(assembly => AssemblyHelper.GetTypesFromAssembly(assembly)); }
         }
 
-        [Obsolete("Use public TypeCache.GetTypesDerivedFrom<> API instead.")]
-        static internal IEnumerable<Type> SubclassesOf(Type parent)
-        {
-            return parent.IsInterface ?
-                GetAllTypesWithInterface(parent) :
-                SubclassesOfClass(parent);
-        }
-
-        [Obsolete("Use public TypeCache.GetTypesDerivedFrom<> API instead.")]
-        static internal IEnumerable<Type> SubclassesOfClass(Type parent)
-        {
-            Type[] types;
-            if (!m_subClasses.TryGetValue(parent, out types))
-            {
-                types = loadedTypes.Where(klass => klass.IsSubclassOf(parent)).ToArray();
-                m_subClasses[parent] = types;
-            }
-            return types;
-        }
-
-        [Obsolete("Use public TypeCache.GetTypesDerivedFrom<> API instead.")]
-        static internal IEnumerable<Type> SubclassesOfGenericType(Type genericType)
-        {
-            return loadedTypes.Where(klass => IsSubclassOfGenericType(klass, genericType));
-        }
-
         private static bool IsSubclassOfGenericType(Type klass, Type genericType)
         {
             if (klass.IsGenericType && klass.GetGenericTypeDefinition() == genericType)

Editor/Mono/EditorGUI.cs

@@ -214,6 +214,7 @@ static class Styles
             public static Texture2D prefabOverlayRemovedIcon = EditorGUIUtility.LoadIcon("PrefabOverlayRemoved Icon");
             public static readonly GUIStyle linkButton = "FloatFieldLinkButton";
             public static Texture2D repaintDot = EditorGUIUtility.LoadIcon("RepaintDot");
+            public static string revertPropertyValueIdenticalToSource = L10n.Tr("Revert (identical value to Prefab '{0}')");
         }
 
         static EditorGUI()
@@ -3027,6 +3028,14 @@ internal static GenericMenu FillPropertyContextMenu(SerializedProperty property,
                     }
                     else if (shouldDisplayPrefabContextMenuItems)
                     {
+                        bool samePropertyValueAsSource = false;
+
+                        Object source = PrefabUtility.GetCorrespondingObjectFromSource(targetObject);
+                        SerializedObject sourceSerializedObject = new SerializedObject(source);
+                        SerializedProperty sourceProperty = sourceSerializedObject.FindProperty(property.propertyPath);
+
+                        samePropertyValueAsSource = SerializedProperty.DataEquals(property, sourceProperty);
+
                         PrefabUtility.HandleApplyRevertMenuItems(
                             null,
                             targetObject,
@@ -3045,7 +3054,18 @@ internal static GenericMenu FillPropertyContextMenu(SerializedProperty property,
                             (menuItemContent) =>
                             {
                                 // Add revert menu item.
-                                pm.AddItem(menuItemContent, false, TargetChoiceHandler.RevertPrefabPropertyOverride, properties);
+                                GUIContent content;
+                                if (samePropertyValueAsSource)
+                                {
+                                    GameObject sourceRoot = PrefabUtility.GetRootGameObject(source);
+                                    content = new GUIContent(string.Format(Styles.revertPropertyValueIdenticalToSource, sourceRoot.name));
+                                }
+                                else
+                                {
+                                    content = menuItemContent;
+                                }
+
+                                pm.AddItem(content, false, TargetChoiceHandler.RevertPrefabPropertyOverride, properties);
                             },
                             false,
                             property.serializedObject.targetObjectsCount
@@ -5827,12 +5847,10 @@ static Rect GetSettingsRect(Rect position, GUIStyle baseStyle, GUIStyle iconButt
 
         internal static bool EnableCheckBoxInTitlebar(Object targetObj)
         {
-            if (targetObj is ScriptableObject && targetObj is StateMachineBehaviour)
-                return true;
-            else if (targetObj is ScriptableObject)
+            if (targetObj is ScriptableObject && targetObj is not StateMachineBehaviour)
                 return false;
-            else
-                return true;
+
+            return true;
         }
 
         // Make an inspector-window-like titlebar.
@@ -5865,17 +5883,24 @@ internal static void DoInspectorTitlebar(Rect position, int id, bool foldout, Ob
             int enabled = -1;
             foreach (Object targetObj in targetObjs)
             {
-                int thisEnabled = EditorUtility.GetObjectEnabled(targetObj);
-                if (enabled == -1)
+                if (comp is MonoBehaviour)
                 {
-                    if (EnableCheckBoxInTitlebar(targetObj))
-                        enabled = thisEnabled;
+                    enabled = 1;
                 }
-                else if (enabled != thisEnabled)
+                else
                 {
-                    enabled = -2;
-                    // Early out: mix value mode
-                    break;
+                    int thisEnabled = EditorUtility.GetObjectEnabled(targetObj);
+                    if (enabled == -1)
+                    {
+                        if (EnableCheckBoxInTitlebar(targetObj))
+                            enabled = thisEnabled;
+                    }
+                    else if (enabled != thisEnabled)
+                    {
+                        enabled = -2;
+                        // Early out: mix value mode
+                        break;
+                    }
                 }
             }
 

Editor/Mono/GUI/ReorderableList.cs

@@ -794,7 +794,7 @@ private float GetListElementHeight()
 
             if (m_CacheCount == 0) CacheIfNeeded();
 
-            if (m_Count <= 0 || isOverMaxMultiEditLimit)
+            if (count <= 0 || isOverMaxMultiEditLimit)
                 height = elementHeight * (isOverMaxMultiEditLimit ? 2 : 1) + listElementPadding;
             else
                 height = GetElementYOffset(m_Count - 1) + GetElementHeight(m_Count - 1) + listElementPadding;

Editor/Mono/HandleUtility.cs

@@ -1291,14 +1291,19 @@ internal static GameObject FindSelectionBaseForPicking(GameObject go)
             // alternatively a GameObject with the SelectionBaseAttribute assigned.
             Transform tr = go.transform;
             GameObject outerMostSelectableRoot = null;
+            GameObject prefabBaseGo = null;
 
             while (tr != null)
             {
                 if (!SceneVisibilityState.IsGameObjectPickingDisabled(tr.gameObject))
                 {
-                    // If we come across the prefab base, no need to search further
-                    if (tr == prefabBase)
-                        return tr.gameObject;
+                    // If we come across the prefab base, we still need to make sure there are no
+                    // go with the SelectionBaseAttribute assigned before returning prefabBaseGo.
+                    if (tr == prefabBase && prefabBaseGo == null)
+                    {
+                        prefabBaseGo = tr.gameObject;
+                        continue;
+                    }
 
                     // Only test again nested prefab if go is already part of a prefab to avoid selecting a
                     // parent prefab is the current go is only child of this prefab but does not belong to it
@@ -1311,14 +1316,18 @@ internal static GameObject FindSelectionBaseForPicking(GameObject go)
                             outerMostSelectableRoot = tr.gameObject;
                     }
 
-                    // If a SelectionBaseAttribute is found, select the nearest to the picked GameObject
+                    // If a SelectionBaseAttribute is found, select the nearest to the picked GameObject.
+                    // GameObjects with the SelectionBaseAttribute should have priority over all others.
                     if (AttributeHelper.GameObjectContainsAttribute<SelectionBaseAttribute>(tr.gameObject))
                         return tr.gameObject;
                 }
 
                 tr = tr.parent;
             }
 
+            if (prefabBaseGo != null)
+                return prefabBaseGo;
+
             return outerMostSelectableRoot;
         }
 

Editor/Mono/Handles.cs

@@ -50,9 +50,11 @@ public sealed partial class Handles
         // internal blend ratio for static colors
         internal static float staticBlend = 0.6f;
 
-        static PrefColor s_ElementPreselectionColor => new PrefColor("Scene/Element Preselection", .29f, .93f, .88f, 1f);
-        static PrefColor s_ElementSelectionColor => new PrefColor("Scene/Element Selection", .93f, 1f, .99f, 1f);
+        static PrefColor s_ElementColor => new PrefColor("Scene/Element Default", 0f, 224f / 255f, 1f, 1f);
+        static PrefColor s_ElementPreselectionColor => new PrefColor("Scene/Element Preselection", 1f, 207f / 255f, 112f / 255f, 1f);
+        static PrefColor s_ElementSelectionColor => new PrefColor("Scene/Element Selection",  1f, 182f / 255f, 40f / 255f, 1f);
 
+        public static Color elementColor => s_ElementColor;
         public static Color elementPreselectionColor => s_ElementPreselectionColor;
         public static Color elementSelectionColor => s_ElementSelectionColor;