Internal/6000.3/staging

Internal/6000.3/staging

Author: claire-nicholson

Packages/com.unity.render-pipelines.core/Documentation~/Images/Preferences/PopUpAdvanced.png

@@ -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~/TableOfContents.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/Documentation~/advanced-properties.md

@@ -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/AssemblyInfo.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/Debugging/DebugWindow.cs

@@ -116,6 +116,9 @@ static AccelStructAdapter BuildAccelerationStructure()
                     if (mesh == null)
                         continue;
 
+                    if (renderer.component is SkinnedMeshRenderer)
+                        continue;
+
                     int subMeshCount = mesh.subMeshCount;
                     var matIndices = new uint[subMeshCount];
                     Array.Fill(matIndices, renderer.component.renderingLayerMask); // repurpose the material id as we don't need it here

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

@@ -213,6 +213,9 @@ static AccelStructAdapter BuildAccelerationStructure()
                     if (!s_TracingContext.TryGetMeshForAccelerationStructure(renderer.component, out var mesh))
                         continue;
 
+                    if (renderer.component is SkinnedMeshRenderer)
+                        continue;
+
                     int subMeshCount = mesh.subMeshCount;
                     var matIndices = GetMaterialIndices(renderer.component);
                     var perSubMeshMask = new uint[subMeshCount];

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

@@ -140,6 +140,9 @@ static AccelStructAdapter BuildAccelerationStructure(int mask)
                     if (!s_TracingContext.TryGetMeshForAccelerationStructure(renderer.component, out var mesh))
                         continue;
 
+                    if (renderer.component is SkinnedMeshRenderer)
+                        continue;
+
                     int subMeshCount = mesh.subMeshCount;
                     var maskAndMatDummy = new uint[subMeshCount];
                     System.Array.Fill(maskAndMatDummy, 0xFFFFFFFF);

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

@@ -1162,6 +1162,21 @@ static void BakeDelegate(ref float progress, ref bool done)
             }
         }
 
+        // Required by native side.
+        [Scripting.Preserve]
+        static bool CurrentSceneHasBakedData()
+        {
+            if (!ProbeReferenceVolume.instance.isInitialized || !ProbeReferenceVolume.instance.enabledBySRP)
+                return false;
+
+            string sceneGUID = SceneManager.GetActiveScene().GetGUID();
+            ProbeReferenceVolume.instance.TryGetPerSceneData(sceneGUID, out var sceneData);
+            if (sceneData == null || sceneData.bakingSet == null)
+                return false;
+
+            return sceneData.bakingSet.HasBeenBaked();
+        }
+
         static void FinalizeBake(bool cleanup = true)
         {
             using (new BakingCompleteProfiling(BakingCompleteProfiling.Stages.FinalizingBake))

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

@@ -77,11 +77,24 @@ IEnumerator Subdivide(bool showProgress)
                         var ctx = AdaptiveProbeVolumes.PrepareProbeSubdivisionContext(perSceneDataList, true);
                         var contributors = GIContributors.Find(GIContributors.ContributorFilter.All);
 
+                        var cullCtx = new ProbeVolume.CellCullingContext
+                        {
+                            ActiveCamera = null,
+                            FrustumPlanes = stackalloc Plane[6]
+                        };
+                        ProbeVolume.PrepareCellCulling(ref cullCtx);
+
+                        var sceneToBakingSetMap = ProbeVolumeBakingSet.SceneToBakingSet.Instance;
+                        var probeRefVol = ProbeReferenceVolume.instance;
+
                         // Cull all the cells that are not visible (we don't need them for realtime debug)
-                        ctx.cells.RemoveAll(c =>
+                        for (int i = ctx.cells.Count - 1; i >= 0; i--)
                         {
-                            return probeVolume.ShouldCullCell(c.position);
-                        });
+                            var cell = ctx.cells[i];
+                            bool shouldRemove = probeVolume.ShouldCullCell(cullCtx, sceneToBakingSetMap, probeRefVol, cell.position);
+                            if (shouldRemove)
+                                ctx.cells.RemoveAt(i);
+                        }
 
                         Camera activeCamera = Camera.current ?? SceneView.lastActiveSceneView.camera;