Internal/6000.4/staging

Packages/com.unity.render-pipelines.core/Documentation~/TableOfContents.md

@@ -36,6 +36,7 @@
   * [Customize the UI of a setting](customize-ui-for-a-setting.md)
   * [Get custom graphics settings](get-custom-graphics-settings.md)
   * [Include or exclude a setting in your build](choose-whether-unity-includes-a-graphics-setting-in-your-build.md)
+  * [Advanced Properties](advanced-properties.md)
 * [Shaders](shaders.md)
   * [Use shader methods from the SRP Core shader library](built-in-shader-methods.md)
   * [Synchronizing shader code and C#](generating-shader-includes.md)

Packages/com.unity.render-pipelines.core/Documentation~/advanced-properties.md

@@ -12,29 +12,29 @@ There is a global state per user that stores if Unity displays **advanced proper
 ## Exposing advanced properties within the inspector
 
 Not every component or Volume Override includes advanced properties.
-If one does, it has a contextual menu to the right of each property section header that includes additional properties. To expose advanced properties for that section, open the contextual menu and click **Advanced Properties**.
+If one does, it has a contextual menu to the right of each property section header that includes additional properties. To expose advanced properties for that section, open the contextual menu and click **Show All Advanced Properties**.
 
 For an example, refer to the **Water Surface** component in [High Definition Render Pipeline (HDRP)](https://docs.unity3d.com/Packages/com.unity.render-pipelines.high-definition@latest?subfolder=/manual/settings-and-properties-related-to-the-water-system.html).
 
 By default only standard properties are shown.
 
 ![](Images/Preferences/HDRP_WaterSurface_General.png)
 
-When you select **Advanced Properties**:
+When you select **Show All Advanced Properties**:
 
 ![](Images/Preferences/PopUpAdvanced.png)
 
 **Advanced Properties** become visible:
 
 ![](Images/Preferences/HDRP_WaterSurface_General_Visible.png)
 
-For Volume Overrides, the already existing contextual menu has a **Advanced Properties** toggle as well.
+For Volume Overrides, the already existing contextual menu has a **Show All Advanced Properties** toggle as well.
 
 ## Exposing advanced properties on preferences
 
 You can also access to this global preference by:
 
-1. Open the **Graphics** tab in the **Preferences** window (menu: **Edit > Preferences > Graphics**).
-2. Under **Properties**. Set **Advanced Properties** to **All Visible**.
+1. Open the **Graphics** tab in the **Preferences** window (menu: **Edit > Preferences**, macOS: **Unity > Settings**).
+2. Under **Graphics**, select **Properties**. Set **Advanced Properties** to **All Visible**.
 
 ![](Images/Preferences/AdvancedProperties_Settings.png)

Packages/com.unity.render-pipelines.core/Editor/AssemblyInfo.cs

@@ -4,6 +4,5 @@
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.Core.Editor.Tests")]
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.HighDefinition.Editor.Tests")]
 [assembly: InternalsVisibleTo("Unity.RenderPipelines.Universal.Editor.Tests")]
-[assembly: InternalsVisibleTo("Unity.Testing.VisualEffectGraph.EditorTests")]
 [assembly: InternalsVisibleTo("Assembly-CSharp-Editor-testable")]
 

Packages/com.unity.render-pipelines.core/Editor/BuildProcessors/CoreBuildData.cs

@@ -81,7 +81,7 @@ private void CheckGPUResidentDrawerUsage()
                 return;
 
             GraphicsSettings.GetRenderPipelineSettings<GPUResidentDrawerResources>()
-                .ForEachFieldOfType<ComputeShader>(computeShader => computeShaderCache.Add(computeShader.GetInstanceID(), computeShader));
+                .ForEachFieldOfType<ComputeShader>(computeShader => computeShaderCache.Add(computeShader.GetEntityId(), computeShader));
         }
 
         /// <summary>

Packages/com.unity.render-pipelines.core/Editor/BuildProcessors/ShaderStrippers/SRPDisabledComputeShaderVariantStripper.cs

@@ -8,6 +8,6 @@ class SRPDisabledComputeShaderVariantStripper : IComputeShaderVariantStripper
         public bool active => !CoreBuildData.instance.buildingPlayerForRenderPipeline;
 
         public bool CanRemoveVariant([DisallowNull] ComputeShader shader, string _, ShaderCompilerData __)
-            => CoreBuildData.instance.computeShaderCache.ContainsKey(shader.GetInstanceID());
+            => CoreBuildData.instance.computeShaderCache.ContainsKey(shader.GetEntityId());
     }
 }

Packages/com.unity.render-pipelines.core/Editor/Debugging/DebugWindow.cs

@@ -30,7 +30,7 @@ public int selectedPanel
             get => Mathf.Max(0, DebugManager.instance.PanelIndex(selectedPanelDisplayName));
             set
             {
-                var displayName = DebugManager.instance.PanelDiplayName(value);
+                var displayName = DebugManager.instance.PanelDisplayName(value);
                 if (!string.IsNullOrEmpty(displayName))
                     selectedPanelDisplayName = displayName;
             }

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.RenderingLayers.cs

@@ -127,14 +127,14 @@ static AccelStructAdapter BuildAccelerationStructure()
                     Span<bool> perSubMeshOpaqueness = stackalloc bool[subMeshCount];
                     perSubMeshOpaqueness.Fill(true);
 
-                    accelStruct.AddInstance(renderer.component.GetInstanceID(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
+                    accelStruct.AddInstance(renderer.component.GetEntityId(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
                 }
 
                 foreach (var terrain in contributors.terrains)
                 {
                     uint mask = GetInstanceMask(terrain.component.shadowCastingMode);
                     uint materialID = terrain.component.renderingLayerMask; // repurpose the material id as we don't need it here
-                    accelStruct.AddInstance(terrain.component.GetInstanceID(), terrain.component, new uint[1] { mask }, new uint[1] { materialID }, new bool[1] { true }, 1);
+                    accelStruct.AddInstance(terrain.component.GetEntityId(), terrain.component, new uint[1] { mask }, new uint[1] { materialID }, new bool[1] { true }, 1);
                 }
 
                 return accelStruct;

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.SkyOcclusion.cs

@@ -223,13 +223,13 @@ static AccelStructAdapter BuildAccelerationStructure()
                     Span<bool> perSubMeshOpaqueness = stackalloc bool[subMeshCount];
                     perSubMeshOpaqueness.Fill(true);
 
-                    accelStruct.AddInstance(renderer.component.GetInstanceID(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
+                    accelStruct.AddInstance((int)renderer.component.GetEntityId().GetRawData(), renderer.component, perSubMeshMask, matIndices, perSubMeshOpaqueness, 1);
                 }
 
                 foreach (var terrain in contributors.terrains)
                 {
                     uint mask = GetInstanceMask(terrain.component.shadowCastingMode);
-                    accelStruct.AddInstance(terrain.component.GetInstanceID(), terrain.component, new uint[1] { mask }, new uint[1] { 0 }, new bool[1] { true }, 1);
+                    accelStruct.AddInstance(terrain.component.GetEntityId(), terrain.component, new uint[1] { mask }, new uint[1] { 0 }, new bool[1] { true }, 1);
                 }
 
                 return accelStruct;

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeGIBaking.VirtualOffset.cs

@@ -149,7 +149,7 @@ static AccelStructAdapter BuildAccelerationStructure(int mask)
                     Span<bool> perSubMeshOpaqueness = stackalloc bool[subMeshCount];
                     perSubMeshOpaqueness.Fill(true);
 
-                    accelStruct.AddInstance(renderer.component.GetInstanceID(), renderer.component, maskAndMatDummy, maskAndMatDummy, perSubMeshOpaqueness, 1);
+                    accelStruct.AddInstance(renderer.component.GetEntityId(), renderer.component, maskAndMatDummy, maskAndMatDummy, perSubMeshOpaqueness, 1);
                 }
 
                 foreach (var terrain in contributors.terrains)
@@ -158,7 +158,7 @@ static AccelStructAdapter BuildAccelerationStructure(int mask)
                     if ((layerMask & mask) == 0)
                         continue;
 
-                    accelStruct.AddInstance(terrain.component.GetInstanceID(), terrain.component, new uint[1] { 0xFFFFFFFF }, new uint[1] { 0xFFFFFFFF }, new bool[1] { true }, 1);
+                    accelStruct.AddInstance(terrain.component.GetEntityId(), terrain.component, new uint[1] { 0xFFFFFFFF }, new uint[1] { 0xFFFFFFFF }, new bool[1] { true }, 1);
                 }
 
                 return accelStruct;
@@ -350,7 +350,7 @@ static internal void RecomputeVOForDebugOnly()
             var chunkSizeInProbes = ProbeBrickPool.GetChunkSizeInProbeCount();
             var hasVirtualOffsets = m_BakingSet.settings.virtualOffsetSettings.useVirtualOffset;
             var hasRenderingLayers = m_BakingSet.useRenderingLayers;
-            
+
             if (ValidateBakingCellsSize(bakingCellsArray, chunkSizeInProbes, hasVirtualOffsets, hasRenderingLayers))
             {
                 // Write back the assets.
@@ -480,7 +480,7 @@ static uint[] GetMaterialIndices(Renderer renderer)
             for (int i = 0; i < matIndices.Length; ++i)
             {
                 if (i < renderer.sharedMaterials.Length && renderer.sharedMaterials[i] != null)
-                    matIndices[i] = (uint)renderer.sharedMaterials[i].GetInstanceID();
+                    matIndices[i] = (uint)renderer.sharedMaterials[i].GetEntityId().GetRawData();
                 else
                     matIndices[i] = 0;
             }

Packages/com.unity.render-pipelines.core/Editor/Lighting/ProbeVolume/ProbeVolumeLightingTab.cs

@@ -361,6 +361,7 @@ void BakingGUI()
                 activeSet = newSet;
 
                 ProbeReferenceVolume.instance.Clear();
+                ProbeReferenceVolume.instance.SetActiveBakingSet(newSet);
             }
 
             if (activeSet != null)

Packages/com.unity.render-pipelines.core/Editor/LookDev/Context.cs

@@ -435,7 +435,7 @@ public void UpdateViewedObject(GameObject viewedObject)
 
             bool fromHierarchy = viewedObject.scene.IsValid();
             if (fromHierarchy)
-                viewedObjecHierarchytEntityId = viewedObject.GetInstanceID();
+                viewedObjecHierarchytEntityId = viewedObject.GetEntityId();
             else
                 viewedObjectAssetGUID = AssetDatabase.AssetPathToGUID(AssetDatabase.GetAssetPath(viewedObject));
             viewedObjectReference = viewedObject;

Packages/com.unity.render-pipelines.core/Editor/LookDev/EnvironmentLibrary.cs

@@ -191,7 +191,7 @@ public static void CreateAndAssignTo(ObjectField field)
             var icon = EditorGUIUtility.FindTexture("ScriptableObject Icon");
             var assetCreator = ScriptableObject.CreateInstance<EnvironmentLibraryCreator>();
             assetCreator.SetField(field);
-            ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetInstanceID(), assetCreator, "New EnvironmentLibrary.asset", icon, null);
+            ProjectWindowUtil.StartNameEditingIfProjectWindowExists(assetCreator.GetEntityId(), assetCreator, "New EnvironmentLibrary.asset", icon, null);
         }
     }
 

Packages/com.unity.render-pipelines.core/Editor/PathTracing/LightBakerStrangler.cs

@@ -372,7 +372,7 @@ internal static bool Bake(string bakeInputPath, string lightmapRequestsPath, str
                 // Read BakeInput and requests from LightBaker
                 if (!BakeInputSerialization.Deserialize(bakeInputPath, out BakeInput bakeInput))
                     return false;
-            if (!BakeInputSerialization.Deserialize(lightmapRequestsPath, out LightmapRequestData lightmapRequestData))
+                if (!BakeInputSerialization.Deserialize(lightmapRequestsPath, out LightmapRequestData lightmapRequestData))
                     return false;
                 if (!BakeInputSerialization.Deserialize(lightProbeRequestsPath, out ProbeRequestData probeRequestData))
                     return false;
@@ -400,33 +400,33 @@ internal static bool Bake(string bakeInputPath, string lightmapRequestsPath, str
                 using UnityComputeWorld world = new();
                 world.Init(rayTracingContext, worldResources);
 
-            using var samplingResources = new UnityEngine.Rendering.Sampling.SamplingResources();
-            samplingResources.Load((uint)UnityEngine.Rendering.Sampling.SamplingResources.ResourceType.All);
+                using var samplingResources = new UnityEngine.Rendering.Sampling.SamplingResources();
+                samplingResources.Load((uint)UnityEngine.Rendering.Sampling.SamplingResources.ResourceType.All);
 
-            // Deserialize BakeInput, inject data into world
-            const bool useLegacyBakingBehavior = true;
-            const bool autoEstimateLUTRange = true;
-            BakeInputToWorldConversion.InjectBakeInputData(world.PathTracingWorld, autoEstimateLUTRange, in bakeInput,
+                // Deserialize BakeInput, inject data into world
+                const bool useLegacyBakingBehavior = true;
+                const bool autoEstimateLUTRange = true;
+                BakeInputToWorldConversion.InjectBakeInputData(world.PathTracingWorld, autoEstimateLUTRange, in bakeInput,
                     out Bounds sceneBounds, out world.Meshes, out FatInstance[] fatInstances, out world.LightHandles,
                     world.TemporaryObjects, UnityComputeWorld.RenderingObjectLayer);
 
                 // Add instances to world
-            WorldHelpers.AddContributingInstancesToWorld(world.PathTracingWorld, in fatInstances, out var lodInstances, out var lodgroupToContributorInstances);
+                WorldHelpers.AddContributingInstancesToWorld(world.PathTracingWorld, in fatInstances, out var lodInstances, out var lodgroupToContributorInstances);
 
-            // Build world with extracted data
-            const bool emissiveSampling = true;
-            world.PathTracingWorld.Build(sceneBounds, deviceContext.GetCommandBuffer(), ref world.ScratchBuffer, samplingResources, emissiveSampling);
+                // Build world with extracted data
+                const bool emissiveSampling = true;
+                world.PathTracingWorld.Build(sceneBounds, deviceContext.GetCommandBuffer(), ref world.ScratchBuffer, samplingResources, emissiveSampling);
 
                 LightmapBakeSettings lightmapBakeSettings = GetLightmapBakeSettings(bakeInput);
                 // Build array of lightmap descriptors based on the atlassing data and instances.
-            LightmapDesc[] lightmapDescriptors = PopulateLightmapDescsFromAtlassing(in lightmapRequestData.atlassing, in fatInstances);
+                LightmapDesc[] lightmapDescriptors = PopulateLightmapDescsFromAtlassing(in lightmapRequestData.atlassing, in fatInstances);
                 SortInstancesByMeshAndResolution(lightmapDescriptors);
 
                 ulong probeWorkSteps = CalculateWorkStepsForProbeRequests(in bakeInput, in probeRequestData);
-            ulong lightmapWorkSteps = CalculateWorkStepsForLightmapRequests(in lightmapRequestData, lightmapDescriptors, lightmapBakeSettings);
+                ulong lightmapWorkSteps = CalculateWorkStepsForLightmapRequests(in lightmapRequestData, lightmapDescriptors, lightmapBakeSettings);
                 progressState.SetTotalWorkSteps(probeWorkSteps + lightmapWorkSteps);
 
-            if (!ExecuteProbeRequests(in bakeInput, in probeRequestData, deviceContext, useLegacyBakingBehavior, world, bakeInput.lightingSettings.maxBounces, progressState, samplingResources))
+                if (!ExecuteProbeRequests(in bakeInput, in probeRequestData, deviceContext, useLegacyBakingBehavior, world, bakeInput.lightingSettings.maxBounces, progressState, samplingResources))
                     return false;
 
                 if (lightmapRequestData.requests.Length <= 0)
@@ -436,7 +436,7 @@ internal static bool Bake(string bakeInputPath, string lightmapRequestsPath, str
                 LightmapResourceLibrary resources = new();
                 resources.Load(world.RayTracingContext);
 
-            if (ExecuteLightmapRequests(in lightmapRequestData, deviceContext, world, in fatInstances, in lodInstances, in lodgroupToContributorInstances, integrationSettings, useLegacyBakingBehavior, resources, progressState, lightmapDescriptors, lightmapBakeSettings, samplingResources) != Result.Success)
+                if (ExecuteLightmapRequests(in lightmapRequestData, deviceContext, world, in fatInstances, in lodInstances, in lodgroupToContributorInstances, integrationSettings, useLegacyBakingBehavior, resources, progressState, lightmapDescriptors, lightmapBakeSettings, samplingResources) != Result.Success)
                     return false;
 
                 CoreUtils.Destroy(resources.UVFallbackBufferGenerationMaterial);

Packages/com.unity.render-pipelines.core/Editor/PostProcessing/LensFlareDataSRPEditor.cs

@@ -765,7 +765,7 @@ void DrawSummary(Rect summaryRect, SerializedProperty element, int index)
             {
                 SerializedProperty lensFlareDataSRP = element.FindPropertyRelative("lensFlareDataSRP");
                 fieldRect.MoveNext();
-                EditorGUI.PropertyField(fieldRect.Current, lensFlareDataSRP, Styles.lensFlareDataSRP);
+                DrawLensFlareDataSRPFieldWithCycleDetection(fieldRect.Current, lensFlareDataSRP, Styles.lensFlareDataSRP);
                 EditorGUIUtility.labelWidth = oldLabelWidth;
                 return;
             }
@@ -923,7 +923,7 @@ void DrawTypeCathegory(ref Rect remainingRect, SerializedProperty element)
                     {
                         SerializedProperty lensFlareDataSRP = element.FindPropertyRelative("lensFlareDataSRP");
                         fieldRect.MoveNext();
-                        EditorGUI.PropertyField(fieldRect.Current, lensFlareDataSRP, Styles.lensFlareDataSRP);
+                        DrawLensFlareDataSRPFieldWithCycleDetection(fieldRect.Current, lensFlareDataSRP, Styles.lensFlareDataSRP);
                     }
                 break;
             }
@@ -1252,6 +1252,67 @@ T GetEnum<T>(SerializedProperty property)
 
         void SetEnum<T>(SerializedProperty property, T value)
             => property.intValue = (int)(object)value;
+
+        void DrawLensFlareDataSRPFieldWithCycleDetection(Rect rect, SerializedProperty lensFlareDataSRPProperty, GUIContent label)
+        {
+            LensFlareDataSRP currentAsset = target as LensFlareDataSRP;
+
+            EditorGUI.BeginChangeCheck();
+            LensFlareDataSRP newValue = EditorGUI.ObjectField(rect, label, lensFlareDataSRPProperty.objectReferenceValue, typeof(LensFlareDataSRP), false) as LensFlareDataSRP;
+
+            if (EditorGUI.EndChangeCheck())
+            {
+                // Check for cycles before setting the value
+                bool wouldCreateCycle = false;
+
+                if (newValue != null && currentAsset != null)
+                {
+                    // Direct self-reference check
+                    if (currentAsset == newValue)
+                    {
+                        wouldCreateCycle = true;
+                    }
+                    else
+                    {
+                        // Multi-level cycle check - see if newValue already references currentAsset
+                        HashSet<LensFlareDataSRP> visited = new HashSet<LensFlareDataSRP>();
+
+                        // Recursive function to check if targetAsset is found in asset's dependency chain
+                        bool CheckCycle(LensFlareDataSRP asset, LensFlareDataSRP targetAsset)
+                        {
+                            if (asset == null || visited.Contains(asset))
+                                return false;
+
+                            visited.Add(asset);
+
+                            foreach (var element in asset.elements)
+                            {
+                                if (element.flareType == SRPLensFlareType.LensFlareDataSRP && element.lensFlareDataSRP != null)
+                                {
+                                    if (element.lensFlareDataSRP == targetAsset || CheckCycle(element.lensFlareDataSRP, targetAsset))
+                                        return true;
+                                }
+                            }
+                            return false;
+                        }
+
+                        wouldCreateCycle = CheckCycle(newValue, currentAsset);
+                    }
+                }
+
+                if (wouldCreateCycle)
+                {
+                    // Cycle detected - set to null and show a warning
+                    lensFlareDataSRPProperty.objectReferenceValue = null;
+                    Debug.LogWarning($"Cannot assign lens flare asset '{newValue.name}' because it would create a cyclic dependency. Setting to null to prevent infinite loop.");
+                }
+                else
+                {
+                    lensFlareDataSRPProperty.objectReferenceValue = newValue;
+                }
+            }
+        }
+
         #endregion
     }
 }