Skip to content

Fixed a serialization issue, preventing quality level parameters to undo/redo and update scene view on change. #841

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.

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 4 commits into from
Jun 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Appropriately constraint blend distance of reflection probe while editing with the inspector (case 1248931)
- Fixed AxF handling of roughness for Blinn-Phong type materials
- Fixed AxF UI errors when surface type is switched to transparent
- Fixed a serialization issue, preventing quality level parameters to undo/redo and update scene view on change.

### Changed
- Improve MIP selection for decals on Transparents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@ public override bool OnGUI(SerializedDataParameter parameter, GUIContent title)
rect.y += 2;
rect.width -= 3;

o.levelAndOverride = SerializedScalableSettingValueUI.LevelFieldGUI(
var levelAndOverride = SerializedScalableSettingValueUI.LevelFieldGUI(
rect,
title,
ScalableSettingSchema.GetSchemaOrNull(ScalableSettingSchemaId.With3Levels),
level,
useOverride
);
value.intValue = ScalableSettingLevelParameter.GetScalableSettingLevelParameterValue(levelAndOverride.level, levelAndOverride.useOverride);
return true;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ public ScalableSettingLevelParameter(int level, bool useOverride, bool overrideS

}

internal static int GetScalableSettingLevelParameterValue(int level, bool useOverride)
{
return useOverride ? LevelCount : (int)level;
}

/// <summary>
/// Level and Override.
/// </summary>
Expand All @@ -42,7 +47,7 @@ public ScalableSettingLevelParameter(int level, bool useOverride, bool overrideS
set
{
var (level, useOverride) = value;
this.value = useOverride ? LevelCount : (int)level;
this.value = GetScalableSettingLevelParameterValue(level, useOverride);
}
}
}
Expand Down