Skip to content

[RPW]Fix recovering the correct index for DebugUI.Enum field that are not autoenum #6901

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 1 commit into from
Feb 1, 2022
Merged

[RPW]Fix recovering the correct index for DebugUI.Enum field that are not autoenum #6901

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions com.unity.render-pipelines.core/Editor/Debugging/DebugState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,18 @@ public sealed class DebugStateEnum : DebugState<int>, ISerializationCallbackRece
public override void SetValue(object value, DebugUI.IValueField field)
{
m_EnumField = field as DebugUI.EnumField;
this.value = (int)field.ValidateValue(value);
base.SetValue(value, field);
}

void UpdateValue()
{
if (m_EnumField != null)
{
m_EnumField.SetValue(value);
m_EnumField.setIndex?.Invoke(value);
base.SetValue(value, m_EnumField);
// There might be cases that the value does not map the index, look for the correct index
var newCurrentIndex = Array.IndexOf(m_EnumField.enumValues, value);
if (m_EnumField.currentIndex != newCurrentIndex)
m_EnumField.currentIndex = newCurrentIndex;
}
}

Expand Down