Skip to content

[HDRP] Fix issue with saving some quality settings in volume overrides #2758

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
Nov 26, 2020
Merged

[HDRP] Fix issue with saving some quality settings in volume overrides #2758

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
3966124
Fix issue with saving some quality settings volume overrides
pmavridis Nov 26, 2020
1f07e1e
Fix typo in changelog
pmavridis Nov 26, 2020
73ffbaf
Merge branch 'hd/bugfix' into HDRP/fix_quality_settings
sebastienlagarde Nov 26, 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 @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed probe volumes debug views.
- Fixed lookdev movement.
- Fixed volume component tooltips using the same parameter name.
- Fixed issue with saving some quality settings in volume overrides (case 1293747)

### Changed
- Removed the material pass probe volumes evaluation mode.
Expand Down
23 changes: 14 additions & 9 deletions ...der-pipelines.high-definition/Editor/Lighting/Reflection/HDScreenSpaceReflectionEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,17 +98,22 @@ public override void OnEnable()

void RayTracingQualityModeGUI()
{
PropertyField(m_MinSmoothness, k_MinimumSmoothnessText);
PropertyField(m_SmoothnessFadeStart, k_SmoothnessFadeStartText);
m_SmoothnessFadeStart.value.floatValue = Mathf.Max(m_MinSmoothness.value.floatValue, m_SmoothnessFadeStart.value.floatValue);
PropertyField(m_RayLength, k_RayLengthText);
PropertyField(m_ClampValue, k_ClampValueText);
PropertyField(m_SampleCount, k_SampleCountText);
PropertyField(m_BounceCount, k_BounceCountText);
PropertyField(m_Denoise, k_DenoiseText);
base.OnInspectorGUI();
using (new HDEditorUtils.IndentScope())
using (new QualityScope(this))
{
PropertyField(m_DenoiserRadius, k_DenoiseRadiusText);
PropertyField(m_MinSmoothness, k_MinimumSmoothnessText);
PropertyField(m_SmoothnessFadeStart, k_SmoothnessFadeStartText);
m_SmoothnessFadeStart.value.floatValue = Mathf.Max(m_MinSmoothness.value.floatValue, m_SmoothnessFadeStart.value.floatValue);
PropertyField(m_RayLength, k_RayLengthText);
PropertyField(m_ClampValue, k_ClampValueText);
PropertyField(m_SampleCount, k_SampleCountText);
PropertyField(m_BounceCount, k_BounceCountText);
PropertyField(m_Denoise, k_DenoiseText);
using (new HDEditorUtils.IndentScope())
{
PropertyField(m_DenoiserRadius, k_DenoiseRadiusText);
}
}
}

Expand Down
31 changes: 21 additions & 10 deletions ...er-pipelines.high-definition/Editor/RenderPipeline/Raytracing/GlobalIlluminationEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,17 @@ public override void OnInspectorGUI()
break;
case RayTracingMode.Quality:
{
PropertyField(m_RayLength, k_RayLengthText);
PropertyField(m_ClampValue);
PropertyField(m_SampleCount);
PropertyField(m_BounceCount);
DenoiserGUI();
base.OnInspectorGUI(); // Quality Setting

using (new HDEditorUtils.IndentScope())
using (new QualityScope(this))
{
PropertyField(m_RayLength, k_RayLengthText);
PropertyField(m_ClampValue);
PropertyField(m_SampleCount);
PropertyField(m_BounceCount);
DenoiserGUI();
}
}
break;
}
Expand All @@ -158,11 +164,16 @@ public override void OnInspectorGUI()
else if (currentAsset.currentPlatformRenderPipelineSettings.supportedRayTracingMode ==
RenderPipelineSettings.SupportedRayTracingMode.Quality)
{
PropertyField(m_RayLength, k_RayLengthText);
PropertyField(m_ClampValue);
PropertyField(m_SampleCount);
PropertyField(m_BounceCount);
DenoiserGUI();
base.OnInspectorGUI(); // Quality Setting
EditorGUI.indentLevel++;
using (new QualityScope(this))
{
PropertyField(m_RayLength, k_RayLengthText);
PropertyField(m_ClampValue);
PropertyField(m_SampleCount);
PropertyField(m_BounceCount);
DenoiserGUI();
}
}
else
{
Expand Down