Skip to content

Fix default volume profile collapse #138

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
Apr 16, 2020
Merged

Fix default volume profile collapse #138

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
1c7e585
Only re-create the volume profile editor when the asset is changed
alelievr Apr 15, 2020
3fb2d1c
Updated changelog
alelievr Apr 15, 2020
f1e5ddc
Merge branch 'HDRP/staging' into HDRP/fix/default-volume-profile-coll…
sebastienlagarde Apr 16, 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 @@ -537,6 +537,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed an issue with the specularFGD term being used when the material has a clear coat (lit shader).
- Fixed white flash happening with auto-exposure in some cases (case 1223774)
- Fixed NaN which can appear with real time reflection and inf value
- Fixed an issue that was collapsing the volume components in the HDRP default settings

### Changed
- Color buffer pyramid is not allocated anymore if neither refraction nor distortion are enabled
Expand Down
6 changes: 3 additions & 3 deletions ...y.render-pipelines.high-definition/Editor/RenderPipeline/Settings/DefaultSettingsPanel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public class Styles
ReorderableList m_BeforeTransparentCustomPostProcesses;
ReorderableList m_BeforePostProcessCustomPostProcesses;
ReorderableList m_AfterPostProcessCustomPostProcesses;
int m_CurrentVolumeProfileHash;
int m_CurrentVolumeProfileInstanceID;

public void OnGUI(string searchContext)
{
Expand Down Expand Up @@ -209,9 +209,9 @@ void Draw_VolumeInspector()
EditorGUILayout.EndHorizontal();

// The state of the profile can change without the asset reference changing so in this case we need to reset the editor.
if (m_CurrentVolumeProfileHash != asset.GetHashCode() && m_CachedDefaultVolumeProfileEditor != null)
if (m_CurrentVolumeProfileInstanceID != asset.GetInstanceID() && m_CachedDefaultVolumeProfileEditor != null)
{
m_CurrentVolumeProfileHash = asset.GetHashCode();
m_CurrentVolumeProfileInstanceID = asset.GetInstanceID();
m_CachedDefaultVolumeProfileEditor = null;
}

Expand Down