Unity 6000.0.11f1 C# reference source code

Author: Unity Technologies

Editor/Mono/BuildProfile/BuildProfile.cs

@@ -228,7 +228,7 @@ static void ContextMenuReset(MenuCommand menuCommand)
 
             AssetDatabase.SaveAssetIfDirty(targetBuildProfile);
         }
-        
+
         void ValidateDataConsistency()
         {
             // TODO: Remove migration code (https://jira.unity3d.com/browse/PLAT-8909)
@@ -279,7 +279,10 @@ void CheckSceneListConsistency()
                     scene.path = AssetDatabase.GUIDToAssetPath(scene.guid);
                 }
 
-                if (string.IsNullOrEmpty(scene.path))
+
+                // Asset may have been deleted.
+                // AssetDatabase may cache GUID to/from path mapping.
+                if (string.IsNullOrEmpty(scene.path) || !AssetDatabase.AssetPathExists(scene.path))
                 {
                     // Scene Object may have been deleted from disk.
                     RemoveAt(i);
@@ -288,11 +291,6 @@ void CheckSceneListConsistency()
 
                 if (!isGuidValid)
                     scene.guid = AssetDatabase.GUIDFromAssetPath(scene.path);
-
-                // Asset may have been deleted. AssetDatabase may cache GUID to/from
-                // path mapping.
-                if (AssetDatabase.GetMainAssetTypeFromGUID(scene.guid) is null)
-                    RemoveAt(i);
             }
 
             if (length == m_Scenes.Length)

Editor/Mono/EditorGUI.RenderPipeline.cs

@@ -2,17 +2,14 @@
 // Copyright (c) Unity Technologies. For terms of use, see
 // https://unity3d.com/legal/licenses/Unity_Reference_Only_License
 
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using UnityEditor.Rendering;
+using UnityEditor.Rendering;
 using UnityEngine;
 
 namespace UnityEditor
 {
-    [SuppressMessage("ReSharper", "NotAccessedField.Local")]
     public partial class EditorGUI
     {
-        private static readonly int s_RenderingLayerMaskField = "s_RenderingLayerMaskField".GetHashCode();
+        static readonly int s_RenderingLayerMaskField = nameof(s_RenderingLayerMaskField).GetHashCode();
 
         // Make a field for rendering layer masks.
         public static void RenderingLayerMaskField(Rect position, string label, SerializedProperty property)
@@ -47,29 +44,47 @@ public static RenderingLayerMask RenderingLayerMaskField(Rect position, GUIConte
 
         static uint RenderingLayerMaskFieldInternal(Rect position, GUIContent label, uint layers, SerializedProperty property, GUIStyle style)
         {
-            var id = GUIUtility.GetControlID(s_RenderingLayerMaskField, FocusType.Keyboard, position);
-            if (label != null)
-                position = PrefixLabel(position, id, label);
-
             var (names, values) = RenderPipelineEditorUtility.GetRenderingLayerNamesAndValuesForMask(layers);
-
-            using var scope = new MixedValueScope();
+            var bitCount = RenderPipelineEditorUtility.GetActiveMaxRenderingLayers();
 
             BeginChangeCheck();
-            var newValue = MaskFieldGUI.DoMaskField(position, id, unchecked((int)layers), names, values, style);
-            if (EndChangeCheck() && property != null)
+            var mixedValue = property is { hasMultipleDifferentValues: true };
+            var newValue = DrawMaskField(position, label, layers, names, values, style, mixedValue, !RenderPipelineEditorUtility.DoesMaskContainRenderingLayersOutsideOfMaxBitCount(layers, bitCount));
+            var uintValue = unchecked((uint)newValue);
+
+            if (EndChangeCheck())
             {
-                var bits = property.FindPropertyRelative("m_Bits");
-                Debug.Assert(bits != null, $"Property for RenderingLayerMask doesn't contain m_Bits. You should use new {nameof(RenderingLayerMask)} type with this drawer.");
-                bits.uintValue = (uint)newValue;
+                if (uintValue != uint.MaxValue && BitOperationUtils.AreAllBitsSetForValues(uintValue, values, bitCount))
+                        uintValue = uint.MaxValue;
+
+                if(property != null)
+                    ApplyModifiedProperties(property, uintValue);
             }
 
-            var currentLimit = RenderPipelineEditorUtility.GetActiveMaxRenderingLayers();
-            var newValueUint = unchecked((uint)newValue);
-            if (currentLimit != 32 && newValueUint != uint.MaxValue && newValueUint >= 1u << currentLimit)
-                EditorGUILayout.HelpBox($"Current mask contains layers outside of a supported range by active Render Pipeline. The active Render Pipeline only supports up to {currentLimit} layers. Rendering Layers above {currentLimit} are ignored.", MessageType.Warning);
+            if (RenderPipelineEditorUtility.DoesMaskContainRenderingLayersOutsideOfMaxBitCount(uintValue, bitCount))
+                EditorGUILayout.HelpBox(RenderPipelineEditorUtility.GetOutsideOfMaxBitCountWarningMessage(bitCount), MessageType.Warning);
+
+            return uintValue;
+        }
+
+        static int DrawMaskField(Rect position, GUIContent label, uint layers, string[] names, int[] values, GUIStyle style, bool mixedValue, bool autoSelectEverything)
+        {
+            var id = GUIUtility.GetControlID(s_RenderingLayerMaskField, FocusType.Keyboard, position);
+            if (label != null)
+                position = PrefixLabel(position, id, label);
 
-            return unchecked((uint)newValue);
+            using var scope = new MixedValueScope(mixedValue);
+
+            return MaskFieldGUI.DoMaskField(position, id, unchecked((int)layers), names, values, style, autoSelectEverything: autoSelectEverything);
+        }
+
+        static void ApplyModifiedProperties(SerializedProperty property, uint uintValue)
+        {
+            var bits = property.FindPropertyRelative("m_Bits");
+            Debug.Assert(bits != null, $"Property for RenderingLayerMask doesn't contain m_Bits. You should use new {nameof(RenderingLayerMask)} type with this drawer.");
+            bits.uintValue = uintValue;
+            property.serializedObject.ApplyModifiedProperties();
+            property.serializedObject.SetIsDifferentCacheDirty();
         }
     }
 }

Editor/Mono/EditorGUI.cs

@@ -23,6 +23,7 @@
 using System.Linq;
 using System.Reflection;
 using Unity.Profiling;
+using UnityEditor.Rendering;
 using UnityEngine.Experimental.Rendering;
 using UnityEngine.UIElements;
 using UnityEditor.UIElements;

Editor/Mono/GI/ProbeIntegrator.bindings.cs

@@ -43,9 +43,9 @@ public override string ToString()
         public void Prepare(IDeviceContext context, IWorld world, BufferSlice<Vector3> positions, float pushoff, int bounceCount);
         public void SetProgressReporter(BakeProgressState progress);
         public Result IntegrateDirectRadiance(IDeviceContext context, int positionOffset, int positionCount, int sampleCount,
-            bool ignoreDirectEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut);
+            bool ignoreEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut);
         public Result IntegrateIndirectRadiance(IDeviceContext context, int positionOffset, int positionCount, int sampleCount,
-            bool ignoreIndirectEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut);
+            bool ignoreEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut);
         public Result IntegrateValidity(IDeviceContext context, int positionOffset, int positionCount, int sampleCount, BufferSlice<float> validityEstimateOut);
         public Result IntegrateOcclusion(IDeviceContext context, int positionOffset, int positionCount, int sampleCount,
             int maxLightsPerProbe, BufferSlice<int> perProbeLightIndices, BufferSlice<float> probeOcclusionEstimateOut);
@@ -76,7 +76,7 @@ public void SetProgressReporter(BakeProgressState progress)
             _progress = progress;
         }
         public unsafe IProbeIntegrator.Result IntegrateDirectRadiance(IDeviceContext context, int positionOffset, int positionCount, int sampleCount,
-            bool ignoreDirectEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut)
+            bool ignoreEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut)
         {
             Debug.Assert(context is WintermuteContext, "Expected WintermuteContext but got something else.");
             var wmContext = context as WintermuteContext;
@@ -94,7 +94,8 @@ public unsafe IProbeIntegrator.Result IntegrateDirectRadiance(IDeviceContext con
             int directSampleCount = sampleCount;
             int giSampleCount = 0;
             int envSampleCount = 0;
-            const bool ignoreIndirectEnvironment = true;
+            bool ignoreDirectEnvironment = ignoreEnvironment;
+            bool ignoreIndirectEnvironment = ignoreEnvironment;
             var lightBakerResult = LightBaker.IntegrateProbeDirectRadianceWintermute(positionsPtr, _integrationContext, positionCount, _pushoff,
                 _bounceCount, directSampleCount, giSampleCount, envSampleCount, ignoreDirectEnvironment, ignoreIndirectEnvironment, wmContext, _progress, shPtr);
 
@@ -113,7 +114,7 @@ public unsafe IProbeIntegrator.Result IntegrateDirectRadiance(IDeviceContext con
             return lightBakerResult.ConvertToIProbeIntegratorResult();
         }
         public unsafe IProbeIntegrator.Result IntegrateIndirectRadiance(IDeviceContext context,
-            int positionOffset, int positionCount, int sampleCount, bool ignoreIndirectEnvironment,
+            int positionOffset, int positionCount, int sampleCount, bool ignoreEnvironment,
             BufferSlice<SphericalHarmonicsL2> radianceEstimateOut)
         {
             Debug.Assert(context is WintermuteContext, "Expected WintermuteContext but got something else.");
@@ -130,9 +131,10 @@ public unsafe IProbeIntegrator.Result IntegrateIndirectRadiance(IDeviceContext c
             using var radianceBuffer = new NativeArray<Rendering.SphericalHarmonicsL2>(positionCount, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
             void* shPtr = NativeArrayUnsafeUtility.GetUnsafePtr(radianceBuffer);
             int directSampleCount = 0;
-            const bool ignoreDirectEnvironment = false;
+            bool ignoreDirectEnvironment = ignoreEnvironment;
+            bool ignoreIndirectEnvironment = ignoreEnvironment;
             int giSampleCount = sampleCount;
-            int envSampleCount = ignoreIndirectEnvironment ? 0 : sampleCount;
+            int envSampleCount = sampleCount;
             var lightBakerResult = LightBaker.IntegrateProbeIndirectRadianceWintermute(positionsPtr, _integrationContext, positionCount, _pushoff,
                 _bounceCount, directSampleCount, giSampleCount, envSampleCount, ignoreDirectEnvironment, ignoreIndirectEnvironment, wmContext, _progress, shPtr);
 
@@ -262,7 +264,7 @@ public void SetProgressReporter(BakeProgressState progress)
             _progress = progress;
         }
         public unsafe IProbeIntegrator.Result IntegrateDirectRadiance(IDeviceContext context, int positionOffset, int positionCount, int sampleCount,
-            bool ignoreDirectEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut)
+            bool ignoreEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut)
         {
             Debug.Assert(context is RadeonRaysContext, "Expected RadeonRaysContext but got something else.");
             var rrContext = context as RadeonRaysContext;
@@ -280,7 +282,8 @@ public unsafe IProbeIntegrator.Result IntegrateDirectRadiance(IDeviceContext con
             int directSampleCount = sampleCount;
             int giSampleCount = 0;
             int envSampleCount = 0;
-            const bool ignoreIndirectEnvironment = true;
+            bool ignoreDirectEnvironment = ignoreEnvironment;
+            bool ignoreIndirectEnvironment = ignoreEnvironment;
             var lightBakerResult = LightBaker.IntegrateProbeDirectRadianceRadeonRays(positionsPtr, _integrationContext, positionCount, _pushoff,
                 _bounceCount, directSampleCount, giSampleCount, envSampleCount, ignoreDirectEnvironment, ignoreIndirectEnvironment, rrContext, _progress, shPtr);
 
@@ -300,7 +303,7 @@ public unsafe IProbeIntegrator.Result IntegrateDirectRadiance(IDeviceContext con
         }
 
         public unsafe IProbeIntegrator.Result IntegrateIndirectRadiance(IDeviceContext context, int positionOffset, int positionCount, int sampleCount,
-            bool ignoreIndirectEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut)
+            bool ignoreEnvironment, BufferSlice<SphericalHarmonicsL2> radianceEstimateOut)
         {
             Debug.Assert(context is RadeonRaysContext, "Expected RadeonRaysContext but got something else.");
             var rrContext = context as RadeonRaysContext;
@@ -316,9 +319,10 @@ public unsafe IProbeIntegrator.Result IntegrateIndirectRadiance(IDeviceContext c
             using var radianceBuffer = new NativeArray<Rendering.SphericalHarmonicsL2>(positionCount, Allocator.Persistent, NativeArrayOptions.UninitializedMemory);
             void* shPtr = NativeArrayUnsafeUtility.GetUnsafePtr(radianceBuffer);
             int directSampleCount = 0;
-            const bool ignoreDirectEnvironment = false;
+            bool ignoreDirectEnvironment = ignoreEnvironment;
+            bool ignoreIndirectEnvironment = ignoreEnvironment;
             int giSampleCount = sampleCount;
-            int envSampleCount = ignoreIndirectEnvironment ? 0 : sampleCount;
+            int envSampleCount = sampleCount;
             var lightBakerResult = LightBaker.IntegrateProbeIndirectRadianceRadeonRays(positionsPtr, _integrationContext, positionCount, _pushoff,
                 _bounceCount, directSampleCount, giSampleCount, envSampleCount, ignoreDirectEnvironment, ignoreIndirectEnvironment, rrContext, _progress, shPtr);
 

Editor/Mono/GUI/MaskFieldGUI.cs

@@ -111,27 +111,27 @@ public void UpdateFlagChanges(int controlID, int mask, int[] optionMaskValues)
         }
 
         /// Make a field for a generic mask.
-        internal static int DoMaskField(Rect position, int controlID, int mask, string[] flagNames, GUIStyle style)
+        internal static int DoMaskField(Rect position, int controlID, int mask, string[] flagNames, GUIStyle style, bool autoSelectEverything = true)
         {
             int dummyInt;
             bool dummyBool;
-            return DoMaskField(position, controlID, mask, flagNames, style, out dummyInt, out dummyBool);
+            return DoMaskField(position, controlID, mask, flagNames, style, out dummyInt, out dummyBool, autoSelectEverything);
         }
 
-        internal static int DoMaskField(Rect position, int controlID, int mask, string[] flagNames, int[] flagValues, GUIStyle style)
+        internal static int DoMaskField(Rect position, int controlID, int mask, string[] flagNames, int[] flagValues, GUIStyle style, bool autoSelectEverything = true)
         {
             int dummyInt;
             bool dummyBool;
-            return DoMaskField(position, controlID, mask, flagNames, flagValues, style, out dummyInt, out dummyBool);
+            return DoMaskField(position, controlID, mask, flagNames, flagValues, style, out dummyInt, out dummyBool, autoSelectEverything: autoSelectEverything);
         }
 
-        internal static int DoMaskField(Rect position, int controlID, int mask, string[] flagNames, GUIStyle style, out int changedFlags, out bool changedToValue)
+        internal static int DoMaskField(Rect position, int controlID, int mask, string[] flagNames, GUIStyle style, out int changedFlags, out bool changedToValue, bool autoSelectEverything = true)
         {
             var flagValues = new int[flagNames.Length];
             for (int i = 0; i < flagValues.Length; ++i)
                 flagValues[i] = (1 << i);
 
-            return DoMaskField(position, controlID, mask, flagNames, flagValues, style, out changedFlags, out changedToValue);
+            return DoMaskField(position, controlID, mask, flagNames, flagValues, style, out changedFlags, out changedToValue, autoSelectEverything: autoSelectEverything);
         }
 
         internal static void DestroyMaskCallBackInfo()
@@ -142,11 +142,11 @@ internal static void DestroyMaskCallBackInfo()
         /// Make a field for a generic mask.
         /// This version also gives you back which flags were changed and what they were changed to.
         /// This is useful if you want to make the same change to multiple objects.
-        internal static int DoMaskField(Rect position, int controlID, int mask, string[] flagNames, int[] flagValues, GUIStyle style, out int changedFlags, out bool changedToValue, Type enumType = null)
+        internal static int DoMaskField(Rect position, int controlID, int mask, string[] flagNames, int[] flagValues, GUIStyle style, out int changedFlags, out bool changedToValue, Type enumType = null, bool autoSelectEverything = true)
         {
             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 _, enumType);
+            GetMenuOptions(mask, flagNames, flagValues, out var buttonText, out var buttonTextMixed, out var optionNames, out var optionMaskValues, out _, enumType, autoSelectEverything);
 
             // This checks and update flags changes that are modified out of dropdown menu
             if (MaskCallbackInfo.m_Instance != null)
@@ -161,7 +161,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);
-                MaskCallbackInfo.m_Instance.m_DropDown = new MaskFieldDropDown(optionNames, flagValues, optionMaskValues, mask, MaskCallbackInfo.m_Instance.SetMaskValueDelegate);
+                MaskCallbackInfo.m_Instance.m_DropDown = new MaskFieldDropDown(optionNames, flagValues, optionMaskValues, mask, MaskCallbackInfo.m_Instance.SetMaskValueDelegate, autoSelectEverything);
                 PopupWindowWithoutFocus.Show(position, MaskCallbackInfo.m_Instance.m_DropDown);
             }
 
@@ -304,7 +304,7 @@ internal static void CalculateMaskValues(int mask, int[] flagValues, ref int[] o
         }
 
         internal static void GetMenuOptions(int mask, string[] flagNames, int[] flagValues,
-            out string buttonText, out string buttonMixedValuesText, out string[] optionNames, out int[] optionMaskValues, out int[] selectedOptions, Type enumType = null)
+            out string buttonText, out string buttonMixedValuesText, out string[] optionNames, out int[] optionMaskValues, out int[] selectedOptions, Type enumType = null, bool autoSelectEverything = true)
         {
             const int everythingValue = ~0;
             bool hasNothingName = flagValues[0] == 0;
@@ -361,7 +361,7 @@ internal static void GetMenuOptions(int mask, string[] flagNames, int[] flagValu
 
             if (buttonText == null)
             {
-                if (flagMask == intermediateMask)
+                if (flagMask == intermediateMask && autoSelectEverything)
                 {
                     // If all of the available flags are set then show the Everything name.
                     s_SelectedOptionsSet.Add(1);

Editor/Mono/Inspector/Core/AddComponent/AddComponentWindow.cs

@@ -64,7 +64,7 @@ protected override void OnEnable()
 
         private void OnItemSelected(AdvancedDropdownItem item)
         {
-            if (item is ComponentDropdownItem cdi)
+            if (item is ComponentDropdownItem cdi && !string.IsNullOrEmpty(cdi.menuPath))
             {
                 SendUsabilityAnalyticsEvent(new AnalyticsEventData
                 {