Merge pull request #8307 from Unity-Technologies/internal/6000.5/staging

Internal/6000.5/staging

Author: rolandk-unity

.gitattributes

@@ -348,6 +348,9 @@ Editor/Resources/unity[[:space:]]editor[[:space:]]resources filter=lfs diff=lfs
 **/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/cloud2.asset filter=lfs diff=lfs merge=lfs -text
 **/HDRP_RuntimeTests/Assets/Scenes/002-HDMaterials/perlin.asset filter=lfs diff=lfs merge=lfs -text
 
+# Gfx ML acceleration test assets
+**/MachineLearning/**/*.bytes filter=lfs diff=lfs merge=lfs -text
+
 #GfxTests
 **/GfxTestProjectFolder/**/*.[hH][dD][rR] filter=lfs diff=lfs merge=lfs -text
 **/GfxTestProjectFolder/**/*.[tT][gG][aA] filter=lfs diff=lfs merge=lfs -text
@@ -399,3 +402,6 @@ Editor/Resources/unity[[:space:]]editor[[:space:]]resources filter=lfs diff=lfs
 /Tests/EditModeAndPlayModeTests/NetcodeSamples/**/*.[jJ][pP][gG] filter=lfs diff=lfs merge=lfs -text
 /Tests/EditModeAndPlayModeTests/NetcodeSamples/**/*.[tT][iI][fF] filter=lfs diff=lfs merge=lfs -text
 /Tests/EditModeAndPlayModeTests/NetcodeSamples/**/*.[fF][bB][xX] filter=lfs diff=lfs merge=lfs -text
+
+# documentation images
+Documentation/ManualDocs/uploads/Main/unity-xr-tech-stack.png filter=lfs diff=lfs merge=lfs -text

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

@@ -1717,8 +1717,11 @@ Vector3Int GetCellPositionFromVoxel(Vector3Int voxelToLookup, int cellSizeInBric
                         continue;
 
                     // 3.
-                    // Overwrite lighting data with trilinear sampled data from the brick with highest subdiv level
-                    float brickSize = ProbeReferenceVolume.instance.BrickSize(largestBrick.subdivisionLevel - 1);
+                    // Overwrite lighting data with trilinear sampled data from the brick with highest subdiv level.
+                    // Use minBrickSize from m_ProfileInfo (live bake settings), not ProbeReferenceVolume.instance,
+                    // because that runtime state is restored to the previous bake's snapshot at the end of
+                    // ApplySubdivisionResults and would be stale here. UUM-141983.
+                    float brickSize = ProbeVolumeUtil.BrickSize(minBrickSize, largestBrick.subdivisionLevel - 1);
                     float3 uvw = math.clamp((pos - (Vector3)largestBrick.position * minBrickSize) / brickSize, 0, 3);
 
                     var probe = Vector3Int.FloorToInt(uvw);

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

@@ -347,7 +347,11 @@ void BakingGUI()
             m_SingleSceneMode = EditorGUILayout.Popup(Styles.bakingMode, m_SingleSceneMode ? 0 : 1, Styles.bakingModeOptions) == 0;
             if (EditorGUI.EndChangeCheck() && !m_SingleSceneMode)
             {
-                if (activeSet != null) { EditorUtility.SetDirty(activeSet); activeSet.singleSceneMode = false; }
+                if (activeSet != null)
+                {
+                    EditorUtility.SetDirty(activeSet);
+                    activeSet.singleSceneMode = false;
+                }
                 SaveTempBakingSetIfNeeded();
             }
 
@@ -357,11 +361,14 @@ void BakingGUI()
                 return;
             }
 
-            EditorGUI.BeginChangeCheck();
             var newSet = ObjectFieldWithNew(Styles.currentBakingSet, activeSet, CreateBakingSet);
-            if (EditorGUI.EndChangeCheck())
+            if (newSet != activeSet)
             {
-                if (newSet != null) { EditorUtility.SetDirty(newSet); newSet.singleSceneMode = false; }
+                if (newSet != null)
+                {
+                    EditorUtility.SetDirty(newSet);
+                    newSet.singleSceneMode = false;
+                }
                 activeSet = newSet;
 
                 ProbeReferenceVolume.instance.Clear();