Unity 2022.1.0a8 C# reference source code

Author: Unity Technologies

Editor/Mono/2D/SpriteAtlas/EditorSpriteAtlas.bindings.cs

@@ -6,6 +6,7 @@
 using UnityEngine;
 using UnityEngine.U2D;
 using UnityEngine.Bindings;
+using System;
 
 namespace UnityEditor.U2D
 {
@@ -27,6 +28,11 @@ public class SpriteAtlasUtility
 
         public static void PackAtlases(SpriteAtlas[] atlases, BuildTarget target, bool canCancel = true)
         {
+            if (atlases == null)
+                throw new ArgumentNullException("atlases", "Value for parameter atlases is null");
+            foreach (var atlas in atlases)
+                if (atlas == null)
+                    throw new ArgumentNullException("atlases", "One of the elements in atlases is null. Please check your Inputs.");
             PackAtlasesInternal(atlases, target, canCancel, false, true);
         }
     }

Editor/Mono/EditorGUI.cs

@@ -2839,7 +2839,7 @@ internal static GenericMenu FillPropertyContextMenu(SerializedProperty property,
 
                 Object targetObject = property.serializedObject.targetObject;
 
-                var shouldDisplayPrefabContextMenuItems = property.prefabOverride;
+                var shouldDisplayPrefabContextMenuItems = property.prefabOverride || (linkedProperty?.prefabOverride ?? false);
 
                 // Only display the custom apply/revert menu for GameObjects/Components that are not part of a Prefab instance & variant.
                 var shouldDisplayApplyRevertProviderContextMenuItems = targetObject is IApplyRevertPropertyContextMenuItemProvider

Editor/Mono/FileUtil.cs

@@ -8,6 +8,7 @@
 using System.IO;
 using System.Text.RegularExpressions;
 using UnityEngine;
+using UnityEngine.Scripting;
 
 namespace UnityEditor
 {
@@ -333,6 +334,7 @@ internal static bool HasReadOnly(IEnumerable<UnityEngine.Object> assets)
             return false;
         }
 
+        [RequiredByNativeCode]
         internal static bool MakeWritable(string path)
         {
             string absolutePath = FileUtil.PathToAbsolutePath(path);

Editor/Mono/Inspector/InspectorWindow.cs

@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using UnityEditor.Profiling;
 using UnityEngine;
 using UnityEngine.Scripting;
 using UnityEngine.UIElements;
@@ -83,6 +84,23 @@ protected override void OnEnable()
 
             EditorApplication.projectWasLoaded += OnProjectWasLoaded;
             Selection.selectionChanged += OnSelectionChanged;
+            AssemblyReloadEvents.afterAssemblyReload += OnAfterAssemblyReload;
+        }
+
+        private void OnAfterAssemblyReload()
+        {
+            // Case 1348788: After reloading the assemblies after a script compilation,
+            // active editors are not rebuilt automatically. If a custom editor changed
+            // the way it handles multi object editing you won't see the effect in the inspector unless
+            // you change the selection. It is a minor issue. But this call makes sure to rebuild the active
+            // editors if necessary.
+            // Note: This is only a problem when adding the attribute CanEditMultipleObjects. When the attribute is not
+            // there, the editor used for multi editing is the generic inspector. If you add the CanEditMultipleObjects attribute,
+            // a refresh is triggered and we check if the editor instance is still valid, which is the case for the generic inspector
+            // so we don't rebuild it. When removing the CanEditMultipleObjects, the refresh sees that the editor was the custom inspector
+            // but its instance is no longer valid, so it rebuilds the inspector.
+            if (EditorsForMultiEditingChanged())
+                tracker.ForceRebuild();
         }
 
         private void OnProjectWasLoaded()
@@ -127,6 +145,7 @@ protected override void OnDisable()
 
             EditorApplication.projectWasLoaded -= OnProjectWasLoaded;
             Selection.selectionChanged -= OnSelectionChanged;
+            AssemblyReloadEvents.afterAssemblyReload -= OnAfterAssemblyReload;
         }
 
         static internal void RepaintAllInspectors()
@@ -438,5 +457,30 @@ internal Object[] GetInspectedObjects()
                 return null;
             return editor.targets;
         }
+
+        private bool EditorsForMultiEditingChanged()
+        {
+            foreach (var editor in tracker.activeEditors)
+            {
+                if (EditorForMultiEditingChanged(editor, editor.target))
+                    return true;
+            }
+
+            return false;
+        }
+
+        private static bool EditorForMultiEditingChanged(Editor editor, Object target)
+        {
+            if (editor.targets.Length <= 1)
+                return false;
+
+            var currentEditorType = editor.GetType();
+            var expectedEditorType = CustomEditorAttributes.FindCustomEditorType(target, true);
+
+            // Going from generic to generic inspector for multi editing is correctly handled.
+            if (editor is GenericInspector && expectedEditorType == null)
+                return false;
+            return currentEditorType != expectedEditorType;
+        }
     }
 }

Editor/Mono/Inspector/PlayerSettingsEditor/PlayerSettingsEditor.cs

@@ -2861,7 +2861,7 @@ private void OtherSectionOptimizationGUI(BuildPlatform platform)
         }
 
         static ManagedStrippingLevel[] mono_levels = new ManagedStrippingLevel[] { ManagedStrippingLevel.Disabled, ManagedStrippingLevel.Minimal, ManagedStrippingLevel.Low, ManagedStrippingLevel.Medium, ManagedStrippingLevel.High };
-        static ManagedStrippingLevel[] il2cpp_levels = new ManagedStrippingLevel[] { ManagedStrippingLevel.Low, ManagedStrippingLevel.Minimal, ManagedStrippingLevel.Medium, ManagedStrippingLevel.High };
+        static ManagedStrippingLevel[] il2cpp_levels = new ManagedStrippingLevel[] { ManagedStrippingLevel.Minimal, ManagedStrippingLevel.Low, ManagedStrippingLevel.Medium, ManagedStrippingLevel.High };
         // stripping levels vary based on scripting backend
         private ManagedStrippingLevel[] GetAvailableManagedStrippingLevels(ScriptingImplementation backend)
         {

Editor/Mono/Inspector/PreviewRenderUtility.cs

@@ -237,7 +237,7 @@ public void BeginPreview(Rect r, GUIStyle previewBackground)
                 RenderSettings.ambientLight = ambientColor;
 
                 RenderSettings.defaultReflectionMode = UnityEngine.Rendering.DefaultReflectionMode.Custom;
-                RenderSettings.customReflection = defaultEnvTexture as Cubemap;
+                RenderSettings.customReflectionTexture = defaultEnvTexture;
             }
 
             InitPreview(r);
@@ -272,7 +272,7 @@ public void BeginStaticPreview(Rect r)
                     // Most preview windows just want the light probe from the main scene so by default we copy it here. It can then be overridden if user wants.
                     RenderSettings.ambientProbe = oldProbe;
                     RenderSettings.defaultReflectionMode = UnityEngine.Rendering.DefaultReflectionMode.Custom;
-                    RenderSettings.customReflection = defaultEnvTexture as Cubemap;
+                    RenderSettings.customReflectionTexture = defaultEnvTexture;
                 }
             }
         }

Editor/Mono/Prefabs/PrefabUtility.cs

@@ -1152,24 +1152,32 @@ public static void RevertRemovedComponent(GameObject instanceGameObject, Compone
         {
             ThrowExceptionIfNotValidPrefabInstanceObject(instanceGameObject, false);
 
+            // Check dependencies
+            string dependentComponents = string.Join(
+                ", ",
+                GetRemovedComponentDependencies(assetComponent, instanceGameObject, OverrideOperation.Revert).Select(e => ObjectNames.GetInspectorTitle(e)).ToArray());
+            if (!string.IsNullOrEmpty(dependentComponents))
+            {
+                string error = String.Format(
+                    L10n.Tr("Can't revert removed component {0} because it depends on {1}."),
+                    ObjectNames.GetInspectorTitle(assetComponent),
+                    dependentComponents);
+                if (action == InteractionMode.UserAction)
+                {
+                    EditorUtility.DisplayDialog(L10n.Tr("Can't revert removed component"), error, L10n.Tr("OK"));
+                }
+                else
+                {
+                    Debug.LogError(error);
+                }
+                return;
+            }
+
             var actionName = "Revert Prefab removed component";
             var prefabInstanceObject = PrefabUtility.GetPrefabInstanceHandle(instanceGameObject);
 
             if (action == InteractionMode.UserAction)
             {
-                string dependentComponents = string.Join(
-                    ", ",
-                    GetRemovedComponentDependencies(assetComponent, instanceGameObject, OverrideOperation.Revert).Select(e => ObjectNames.GetInspectorTitle(e)).ToArray());
-                if (!string.IsNullOrEmpty(dependentComponents))
-                {
-                    string error = String.Format(
-                        L10n.Tr("Can't revert removed component {0} because it depends on {1}."),
-                        ObjectNames.GetInspectorTitle(assetComponent),
-                        dependentComponents);
-                    EditorUtility.DisplayDialog(L10n.Tr("Can't revert removed component"), error, L10n.Tr("OK"));
-                    return;
-                }
-
                 Undo.RegisterCompleteObjectUndo(instanceGameObject, actionName);
             }
 
@@ -1774,8 +1782,10 @@ public static GameObject ReplacePrefab(GameObject go, Object targetPrefab, Repla
 
             ReplacePrefabArgumentCheck(go, assetPath);
 
+            bool connectToInstance = ((replaceOptions & ReplacePrefabOptions.ConnectToPrefab) != 0) && !EditorUtility.IsPersistent(go);
+
             bool success = false;
-            return SavePrefab_Internal(go, assetPath, (replaceOptions & ReplacePrefabOptions.ConnectToPrefab) != 0, out success);
+            return SavePrefab_Internal(go, assetPath, connectToInstance, out success);
         }
 
         // Returns the corresponding object from its immediate source from a connected Prefab,

Editor/Mono/SceneManagement/StageManager/PrefabStage/PrefabStageUtility.cs

@@ -514,7 +514,7 @@ static Scene CreateDefaultPreviewScene()
             // Setup default render settings for this preview scene
             Unsupported.SetOverrideLightingSettings(previewScene);
             UnityEngine.RenderSettings.defaultReflectionMode = UnityEngine.Rendering.DefaultReflectionMode.Custom;
-            UnityEngine.RenderSettings.customReflection = GetDefaultReflection();   // ensure chrome materials do not render black
+            UnityEngine.RenderSettings.customReflectionTexture = GetDefaultReflection();   // ensure chrome materials do not render black
             UnityEngine.RenderSettings.skybox = AssetDatabase.GetBuiltinExtraResource<Material>("Default-Skybox.mat");
             UnityEngine.RenderSettings.ambientMode = AmbientMode.Skybox;
             UnityEditorInternal.InternalEditorUtility.CalculateAmbientProbeFromSkybox();

External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/Builder.cs

@@ -205,9 +205,9 @@ public override void OnEnableAfterAllSerialization()
             m_Selection.NotifyOfHierarchyChange(document);
         }
 
-        public override void LoadDocument(VisualTreeAsset asset, bool unloadAllSubdocuments = true)
+        public override bool LoadDocument(VisualTreeAsset asset, bool unloadAllSubdocuments = true)
         {
-            m_Toolbar.LoadDocument(asset, unloadAllSubdocuments);
+            return m_Toolbar.LoadDocument(asset, unloadAllSubdocuments);
         }
 
         public override bool NewDocument(bool checkForUnsavedChanges = true, bool unloadAllSubdocuments = true)

External/MirroredPackageSources/com.unity.ui.builder/Editor/Builder/BuilderPaneWindow.cs

@@ -171,9 +171,9 @@ public virtual void OnEnableAfterAllSerialization()
             // Nothing to do by default.
         }
 
-        public virtual void LoadDocument(VisualTreeAsset asset, bool unloadAllSubdocuments = true)
+        public virtual bool LoadDocument(VisualTreeAsset asset, bool unloadAllSubdocuments = true)
         {
-            // Nothing to do by default.
+            return false;
         }
 
         public virtual bool NewDocument(bool checkForUnsavedChanges = true, bool unloadAllSubdocuments = true)