Skip to content

Fixed light layers not correctly disabled when the lightlayers is set to Nothing #584

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.

Sign up for GitHub

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 1 commit into from
May 23, 2020
Merged

Fixed light layers not correctly disabled when the lightlayers is set to Nothing #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Cloned volume profile from read only assets are created in the root of the project. (case 1154961)
- Fixed Wizard check on default volume profile to also check it is not the default one in package.
- Fix erroneous central depth sampling in TAA.
- Fixed light layers not correctly disabled when the lightlayers is set to Nothing and Lightlayers isn't enabled in HDRP Asset

### Changed
- Improve MIP selection for decals on Transparents
Expand Down
6 changes: 3 additions & 3 deletions com.unity.render-pipelines.high-definition/Runtime/Lighting/LightLoop/LightLoop.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,7 @@ internal void GetDirectionalLightData(CommandBuffer cmd, HDCamera hdCamera, Visi

var lightData = new DirectionalLightData();

lightData.lightLayers = additionalLightData.GetLightLayers();
lightData.lightLayers = hdCamera.frameSettings.IsEnabled(FrameSettingsField.LightLayers) ? additionalLightData.GetLightLayers() : uint.MaxValue;

// Light direction for directional is opposite to the forward direction
lightData.forward = light.GetForward();
Expand Down Expand Up @@ -1343,7 +1343,7 @@ internal void GetLightData(CommandBuffer cmd, HDCamera hdCamera, HDShadowSetting
var lightType = processedData.lightType;

var visibleLightAxisAndPosition = light.GetAxisAndPosition();
lightData.lightLayers = additionalLightData.GetLightLayers();
lightData.lightLayers = hdCamera.frameSettings.IsEnabled(FrameSettingsField.LightLayers) ? additionalLightData.GetLightLayers() : uint.MaxValue;

lightData.lightType = gpuLightType;

Expand Down Expand Up @@ -1840,7 +1840,7 @@ internal bool GetEnvLightData(CommandBuffer cmd, HDCamera hdCamera, in Processed
return false;

InfluenceVolume influence = probe.influenceVolume;
envLightData.lightLayers = probe.lightLayersAsUInt;
envLightData.lightLayers = hdCamera.frameSettings.IsEnabled(FrameSettingsField.LightLayers) ? probe.lightLayersAsUInt : uint.MaxValue;
envLightData.influenceShapeType = influence.envShape;
envLightData.weight = processedProbe.weight;
envLightData.multiplier = probe.multiplier * m_indirectLightingController.indirectSpecularIntensity.value;
Expand Down