Skip to content

Fixed blend distance editing (1248931) #838

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
Jun 12, 2020
Merged

Fixed blend distance editing (1248931) #838

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
523ec1d
Fixed blend distance editing (1248931)
fredericv-unity3d Jun 11, 2020
b0eebef
Merge branch 'HDRP/staging' into HDRP/fix_1248931_probe_blend_distance
sebastienlagarde Jun 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 @@ -676,6 +676,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixing the internsity being applied to RTAO too early leading to unexpected results (1254626).
- Fix issue that caused sky to incorrectly render when using a custom projection matrix.
- Fixed null reference exception when using depth pre/post pass in shadergraph with alpha clip in the material.
- Appropriately constraint blend distance of reflection probe while editing with the inspector (case 1248931)

### Changed
- Improve MIP selection for decals on Transparents
Expand Down
1 change: 0 additions & 1 deletion com.unity.render-pipelines.high-definition/Editor/Lighting/Reflection/HDProbeUI.Drawers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ public static void DrawCustomSettings(SerializedHDProbe serialized, Editor owner

public static void DrawInfluenceSettings(SerializedHDProbe serialized, Editor owner)
{
var provider = new TProvider();
InfluenceVolumeUI.Draw<TProvider>(serialized.probeSettings.influence, owner);
}

Expand Down
16 changes: 4 additions & 12 deletions ...-pipelines.high-definition/Editor/Lighting/Reflection/Volume/InfluenceVolumeUI.Drawers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,18 +173,10 @@ static void Drawer_AdvancedBlendDistance(SerializedInfluenceVolume serialized, b
}
else
{
float scalar = editorSimplifiedModeBlendDistance.floatValue;
if (!(Mathf.Approximately(blendDistancePositive.vector3Value.x, scalar)
&& Mathf.Approximately(blendDistancePositive.vector3Value.y, scalar)
&& Mathf.Approximately(blendDistancePositive.vector3Value.z, scalar)
&& Mathf.Approximately(blendDistanceNegative.vector3Value.x, scalar)
&& Mathf.Approximately(blendDistanceNegative.vector3Value.y, scalar)
&& Mathf.Approximately(blendDistanceNegative.vector3Value.z, scalar)))
{
blendDistancePositive.vector3Value = blendDistanceNegative.vector3Value = new Vector3(scalar, scalar, scalar);
serialized.Apply();
SceneView.RepaintAll(); //update gizmo
}
var scalar = Mathf.Min(editorSimplifiedModeBlendDistance.floatValue, Mathf.Min(maxBlendDistance.x, maxBlendDistance.y, maxBlendDistance.z));
blendDistancePositive.vector3Value = blendDistanceNegative.vector3Value = new Vector3(scalar, scalar, scalar);
serialized.Apply();
SceneView.RepaintAll(); //update gizmo
}

if (serialized.editorAdvancedModeEnabled.boolValue)
Expand Down