Skip to content

Fix for assertion on undoing a mod of diffuse profile list with volume profile deleted #1769

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
Sep 4, 2020
Merged

Fix for assertion on undoing a mod of diffuse profile list with volume profile deleted #1769

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
f3539e2
Make sure we don't try to modify deleted stuff
FrancescoC-unity Sep 3, 2020
85e5433
changelog
FrancescoC-unity Sep 3, 2020
27db357
Merge branch 'HDRP/staging' into HDRP/fix-for-assertion-on-list
sebastienlagarde Sep 4, 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
10 changes: 8 additions & 2 deletions com.unity.render-pipelines.core/Editor/Volume/VolumeComponentListEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,14 @@ void OnUndoRedoPerformed()

// Dumb hack to make sure the serialized object is up to date on undo (else there'll be
// a state mismatch when this class is used in a GameObject inspector).
m_SerializedObject.Update();
m_SerializedObject.ApplyModifiedProperties();
if (m_SerializedObject != null
&& !m_SerializedObject.Equals(null)
&& m_SerializedObject.targetObject != null
&& !m_SerializedObject.targetObject.Equals(null))
{
m_SerializedObject.Update();
m_SerializedObject.ApplyModifiedProperties();
}

// Seems like there's an issue with the inspector not repainting after some undo events
// This will take care of that
Expand Down
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 @@ -47,6 +47,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed "Screen position out of view frustum" error when camera is at exactly the planar reflection probe location.
- Fix Amplitude -> Min/Max parametrization conversion
- Fix issue that allocated a small cookie for normal spot lights.
- Fixed issue when undoing a change in diffuse profile list after deleting the volume profile.

### Changed
- Preparation pass for RTSSShadows to be supported by render graph.
Expand Down