Skip to content

Fix issues with light layers issues when editing multiple lights #3323

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
Feb 3, 2021
Merged

Fix issues with light layers issues when editing multiple lights #3323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e294c04
Avoid syncing light layers when we have multiple values.
FrancescoC-unity Feb 1, 2021
58b0fb4
Changelog
FrancescoC-unity Feb 1, 2021
5380fc4
Merge branch 'hd/bugfix' into HDRP/fix-multi-selection-light-layers
sebastienlagarde Feb 3, 2021
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 @@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed various issues with non-temporal SSAO and rendergraph.
- Fix screen being over-exposed when changing very different skies.
- White flashes on camera cuts on volumetric fog.
- Fixed light layer issue when performing editing on multiple lights.

### Changed
- Removed the material pass probe volumes evaluation mode.
Expand Down
4 changes: 2 additions & 2 deletions com.unity.render-pipelines.high-definition/Editor/Lighting/HDLightUI.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ static void DrawGeneralAdditionalContent(SerializedHDLight serialized, Editor ow
EditorGUILayout.PropertyField(serialized.lightlayersMask, s_Styles.lightLayer);

// If we're not in decoupled mode for light layers, we sync light with shadow layers:
if (serialized.linkLightLayers.boolValue && change.changed)
if (serialized.linkLightLayers.boolValue && change.changed && !serialized.lightlayersMask.hasMultipleDifferentValues)
SyncLightAndShadowLayers(serialized, owner);
}
}
Expand Down Expand Up @@ -1199,7 +1199,7 @@ static void DrawShadowMapAdditionalContent(SerializedHDLight serialized, Editor
if (change.changed)
Undo.RecordObjects(owner.targets, "Undo Light Layers Changed");
}
if (!serialized.linkLightLayers.hasMultipleDifferentValues)
if (!serialized.linkLightLayers.hasMultipleDifferentValues && !serialized.lightlayersMask.hasMultipleDifferentValues)
{
using (new EditorGUI.DisabledGroupScope(serialized.linkLightLayers.boolValue))
{
Expand Down