Skip to content

Commit 20b8abf

Browse files
urasmusEvergreen
authored andcommitted
Fix missing environment light in Adaptive Probe Volumes when using Sky Occlusion
1 parent b76f7a8 commit 20b8abf

2 files changed

Lines changed: 4 additions & 9 deletions

File tree

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@
55
using Unity.Collections;
66
using UnityEditor;
77
using UnityEngine.LightTransport;
8-
using UnityEngine.LightTransport.PostProcessing;
9-
using UnityEditor.PathTracing.LightBakerBridge;
10-
using UnityEngine.PathTracing.Core;
11-
using UnityEngine.PathTracing.Integration;
12-
using UnityEngine.PathTracing.PostProcessing;
13-
using UnityEditor.LightBaking;
148
using UnityEngine.Rendering.Sampling;
159
using UnityEngine.Rendering.UnifiedRayTracing;
1610
using UnityEngine.SceneManagement;

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,14 +1092,15 @@ private static void OnInputExtraction(InputExtraction.BakeInput bakeInput)
10921092
bakeInput.SetProbePositions(newPositions);
10931093
bakeInput.SetOcclusionLightIndices(newOcclusionIndices);
10941094

1095+
var ignoreEnvironmentLight = m_BakingSet != null && m_BakingSet.skyOcclusion;
1096+
10951097
var lightmapParameters = LightmapParameters.GetLightmapParametersForLightingSettings(lightingSettings);
10961098
float pushoff = lightmapParameters != null ? lightmapParameters.pushoff : 0.0001f;
10971099

10981100
int requestIdx = 0;
10991101
foreach (var bakeJob in s_BakeData.jobs)
11001102
{
11011103
string probeOutputSubFolder = $"/probeRequest{requestIdx}";
1102-
11031104
bakeInput.AddProbeRequest(new ProbeBakeRequest
11041105
{
11051106
outputTypes = outputTypes,
@@ -1111,8 +1112,8 @@ private static void OnInputExtraction(InputExtraction.BakeInput bakeInput)
11111112
positionLength = (ulong)bakeJob.probeCount,
11121113
bakeOutputFolderPath = APVLightBakerOutputFolder + probeOutputSubFolder,
11131114
postProcessOutputFolderPath = APVLightBakerPostProcessingOutputFolder + probeOutputSubFolder,
1114-
ignoreDirectEnvironment = m_BakingSet != null ? m_BakingSet.bakedSkyOcclusion : false,
1115-
ignoreIndirectEnvironment = m_BakingSet != null ? m_BakingSet.bakedSkyOcclusion : false,
1115+
ignoreDirectEnvironment = ignoreEnvironmentLight,
1116+
ignoreIndirectEnvironment = ignoreEnvironmentLight,
11161117
pushoff = pushoff,
11171118
indirectScale = bakeJob.indirectScale,
11181119
dering = true,

0 commit comments

Comments
 (0)