Skip to content

Fixed baked light being included into the ray tracing light cluster (case 1296203). #2915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions com.unity.render-pipelines.high-definition/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed issue with VT resolve pass rendergraph errors when opaque and transparent are disabled in frame settings.
- Fixed a bug in the sphere-aabb light cluster (case 1294767).
- Fixed issue when submitting SRPContext during EndCameraRendering.
- Fixed baked light being included into the ray tracing light cluster (case 1296203).

### Changed
- Removed the material pass probe volumes evaluation mode.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -265,8 +265,14 @@ void BuildGPULightVolumes(HDCamera hdCamera, HDRayTracingLights rayTracingLights
if (currentLight != null)
{
Light light = currentLight.gameObject.GetComponent<Light>();
if (light == null || !light.enabled) continue;
if (light == null || !light.enabled)
continue;

// If the light is flagged as baked and has been effectively been baked, we need to skip it and not add it to the light cluster
if (light.lightmapBakeType == LightmapBakeType.Baked && light.bakingOutput.isBaked)
continue;

// If this light should not be included when ray tracing is active on the camera, skip it
if (hdCamera.frameSettings.IsEnabled(FrameSettingsField.RayTracing) && !currentLight.includeForRayTracing)
continue;

Expand Down