Skip to content

Fix layer-related error caused by disabling emissive area light mesh #1506

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 3 commits into from
Aug 6, 2020
Merged

Fix layer-related error caused by disabling emissive area light mesh #1506

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52d2af5
Don't actually set the game object -1 as layer
FrancescoC-unity Aug 4, 2020
b8b4a5d
Changelog
FrancescoC-unity Aug 4, 2020
d274eb4
Merge branch 'HDRP/staging' into HDRP/fix-issue-with-layers
sebastienlagarde Aug 6, 2020
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 @@ -758,6 +758,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed GPU hang on D3D12 on xbox.
- Fix several issues with physically-based DoF (TAA ghosting of the CoC buffer, smooth layer transitions, etc)
- Fixed CoatMask block appearing when creating lit master node (case 1264632)
- Fixed error about layers when disabling emissive mesh for area lights.

### Changed
- Improve MIP selection for decals on Transparents
Expand Down
4 changes: 2 additions & 2 deletions com.unity.render-pipelines.high-definition/Runtime/Lighting/Light/HDAdditionalLightData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1723,7 +1723,7 @@ public int areaLightEmissiveMeshLayer
return;

m_AreaLightEmissiveMeshLayer = value;
if (emissiveMeshRenderer != null && !emissiveMeshRenderer.Equals(null))
if (emissiveMeshRenderer != null && !emissiveMeshRenderer.Equals(null) && m_AreaLightEmissiveMeshLayer != -1)
{
emissiveMeshRenderer.gameObject.layer = m_AreaLightEmissiveMeshLayer;
}
Expand Down Expand Up @@ -2509,7 +2509,7 @@ void OnValidate()

RefreshCachedShadow();

if (emissiveMeshRenderer != null && !emissiveMeshRenderer.Equals(null))
if (emissiveMeshRenderer != null && !emissiveMeshRenderer.Equals(null) && m_AreaLightEmissiveMeshLayer != -1)
{
emissiveMeshRenderer.gameObject.layer = m_AreaLightEmissiveMeshLayer;
}
Expand Down