Skip to content

Hd/fix nullref while removing decal component #416

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 2 commits into from
May 12, 2020
Merged

Hd/fix nullref while removing decal component #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11d304b
fix nullref on DecalComponent removed from contextual menu
RSlysz May 12, 2020
c08e49c
Update CHANGELOG.md
RSlysz May 12, 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 @@ -581,6 +581,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed flickering of the game/scene view when lookdev is running.
- Fixed issue with reflection probes in realtime time mode with OnEnable baking having wrong lighting with sky set to dynamic (case 1238047).
- Fixed transparent motion vectors not working when in MSAA.
- Fix error when removing DecalProjector from component contextual menu (case 1243960)

### Changed
- Improve MIP selection for decals on Transparents
Expand Down
5 changes: 3 additions & 2 deletions com.unity.render-pipelines.high-definition/Editor/Material/Decal/DecalProjectorEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,10 @@ private void OnEnable()

private void OnDisable()
{
foreach (var decalProjector in targets)
foreach (DecalProjector decalProjector in targets)
{
(decalProjector as DecalProjector).OnMaterialChange -= UpdateMaterialEditor;
if (decalProjector != null)
decalProjector.OnMaterialChange -= UpdateMaterialEditor;
}
s_Owner = null;
}
Expand Down