Skip to content

Check reflection probe null pointer before use. (case 1244047) #456

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 15, 2020
Merged

Check reflection probe null pointer before use. (case 1244047) #456

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50a7850
Check reflection probe null pointer before use. (case 1244047)
fredericv-unity3d May 14, 2020
d6eaa47
Merge branch 'HDRP/staging' into HDRP/fix_reflection_probe_redo
sebastienlagarde May 15, 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 @@ -595,6 +595,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed some GCAlloc in the debug window.
- Fixed shader graphs not casting semi-transparent and color shadows (case 1242617)
- Fixed thin refraction mode not working properly.
- Fixed error when undo a Reflection Probe removal in a prefab instance. (case 1244047)

### Changed
- Improve MIP selection for decals on Transparents
Expand Down
10 changes: 10 additions & 0 deletions ...ipelines.high-definition/Runtime/Lighting/Reflection/HDAdditionalReflectionData.Legacy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,16 @@ public override void PrepareCulling()
var tr = transform;
var position = tr.position;
var cubeProbe = reflectionProbe;

if (cubeProbe == null || cubeProbe.Equals(null))
{
// case 1244047
// This can happen when removing the component from the editor and then undo the remove.
// The order of call maybe incorrect and the code flows here before the reflection probe
// is restored.
return;
}

switch (influence.shape)
{
case InfluenceShape.Box:
Expand Down