Skip to content

Commit c512660

Browse files
olivierpratEvergreen
authored andcommitted
Added back support for preview adjustments with override sample count.
1 parent 49c1915 commit c512660

File tree

4 files changed

+137
-97
lines changed

4 files changed

+137
-97
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ internal static void BakeAdjustmentVolume(ProbeVolumeBakingSet bakingSet, ProbeA
672672
failed |= !layerMaskJob.Step();
673673

674674
// Bake probe SH
675-
s_BakeData.InitLightingJob(m_BakingSet, uniquePositions, BakeType.ApvOnly);
675+
s_BakeData.InitLightingJob(bakingSet, touchup, uniquePositions, BakeType.ApvOnly);
676676
LightingBaker lightingJob = s_BakeData.lightingJob;
677677
while (!failed && lightingJob.currentStep < lightingJob.stepCount)
678678
failed |= !lightingJob.Step();
@@ -682,7 +682,7 @@ internal static void BakeAdjustmentVolume(ProbeVolumeBakingSet bakingSet, ProbeA
682682
foreach ((int uniqueProbeIndex, int cellIndex, int i) in bakedProbes)
683683
{
684684
ref var cell = ref bakingCells[cellIndex];
685-
cell.SetBakedData(m_BakingSet, m_BakingBatch, cellVolumes[cellIndex], i, uniqueProbeIndex,
685+
cell.SetBakedData(bakingSet, m_BakingBatch, cellVolumes[cellIndex], i, uniqueProbeIndex,
686686
lightingJob.irradiance[uniqueProbeIndex], lightingJob.validity[uniqueProbeIndex],
687687
layerMaskJob.renderingLayerMasks, virtualOffsetJob.offsets,
688688
skyOcclusionJob.occlusion, skyOcclusionJob.encodedDirections, lightingJob.occlusion);
@@ -698,8 +698,8 @@ internal static void BakeAdjustmentVolume(ProbeVolumeBakingSet bakingSet, ProbeA
698698
{
699699
// Validate baking cells size before any global state modifications
700700
var chunkSizeInProbes = ProbeBrickPool.GetChunkSizeInProbeCount();
701-
var hasVirtualOffsets = m_BakingSet.settings.virtualOffsetSettings.useVirtualOffset;
702-
var hasRenderingLayers = m_BakingSet.useRenderingLayers;
701+
var hasVirtualOffsets = bakingSet.settings.virtualOffsetSettings.useVirtualOffset;
702+
var hasRenderingLayers = bakingSet.useRenderingLayers;
703703

704704
if (ValidateBakingCellsSize(bakingCells, chunkSizeInProbes, hasVirtualOffsets, hasRenderingLayers))
705705
{
@@ -709,8 +709,8 @@ internal static void BakeAdjustmentVolume(ProbeVolumeBakingSet bakingSet, ProbeA
709709
ComputeValidityMasks(cell);
710710
}
711711

712-
// Attempt to write the result to disk
713-
if (WriteBakingCells(bakingCells))
712+
// Attempt to write the result to disk.
713+
if (WriteBakingCells(bakingSet, bakingCells))
714714
{
715715
// Reload everything
716716
AssetDatabase.SaveAssets();

0 commit comments

Comments
 (0)