Skip to content

[HDRP] Fixed custom pass custom drawer rendering with SerializedProperties #3898

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
Mar 23, 2021
Merged

[HDRP] Fixed custom pass custom drawer rendering with SerializedProperties #3898

Show file tree
Hide file tree
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
16 changes: 3 additions & 13 deletions ...ity.render-pipelines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassDrawer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,29 +159,19 @@ void DoCommonSettingsGUI(ref Rect rect)

if ((commonPassUIFlags & PassUIFlag.TargetColorBuffer) != 0)
{
EditorGUI.BeginProperty(rect, Styles.targetColorBuffer, m_TargetColorBuffer);
// There is still a bug with SerializedReference and PropertyField so we can't use it yet
// EditorGUI.PropertyField(rect, m_TargetColorBuffer, Styles.targetColorBuffer);
m_TargetColorBuffer.intValue = (int)(CustomPass.TargetBuffer)EditorGUI.EnumPopup(rect, Styles.targetColorBuffer, (CustomPass.TargetBuffer)m_TargetColorBuffer.intValue);
EditorGUI.EndProperty();
EditorGUI.PropertyField(rect, m_TargetColorBuffer, Styles.targetColorBuffer);
rect.y += Styles.defaultLineSpace;
}

if ((commonPassUIFlags & PassUIFlag.TargetDepthBuffer) != 0)
{
EditorGUI.BeginProperty(rect, Styles.targetColorBuffer, m_TargetDepthBuffer);
// EditorGUI.PropertyField(rect, m_TargetDepthBuffer, Styles.targetDepthBuffer);
m_TargetDepthBuffer.intValue = (int)(CustomPass.TargetBuffer)EditorGUI.EnumPopup(rect, Styles.targetDepthBuffer, (CustomPass.TargetBuffer)m_TargetDepthBuffer.intValue);
EditorGUI.EndProperty();
EditorGUI.PropertyField(rect, m_TargetDepthBuffer, Styles.targetDepthBuffer);
rect.y += Styles.defaultLineSpace;
}

if ((commonPassUIFlags & PassUIFlag.ClearFlags) != 0)
{
EditorGUI.BeginProperty(rect, Styles.clearFlags, m_ClearFlags);
// EditorGUI.PropertyField(rect, m_ClearFlags, Styles.clearFlags);
m_ClearFlags.intValue = (int)(ClearFlag)EditorGUI.EnumPopup(rect, Styles.clearFlags, (ClearFlag)m_ClearFlags.intValue);
EditorGUI.EndProperty();
EditorGUI.PropertyField(rect, m_ClearFlags, Styles.clearFlags);
rect.y += Styles.defaultLineSpace;
}
}
Expand Down
1 change: 1 addition & 0 deletions ...nder-pipelines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassVolumeEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,7 @@ void CreateReorderableList(SerializedProperty passList)

passList.serializedObject.ApplyModifiedProperties();
var customPass = passList.GetArrayElementAtIndex(index);
customPass.managedReferenceValue = m_Volume.customPasses[index];
var drawer = GetCustomPassDrawer(customPass, m_Volume.customPasses[index], index);
if (drawer != null)
drawer.OnGUI(rect, customPass, null);
Expand Down
11 changes: 3 additions & 8 deletions ...pelines.high-definition/Editor/RenderPipeline/CustomPass/DrawRenderersCustomPassDrawer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,7 @@ protected override void DoPassGUI(SerializedProperty customPass, Rect rect)
DoShaderPassesList(ref rect);
#endif

// TODO: remove all this code when the fix for SerializedReference lands
m_SortingCriteria.intValue = (int)(SortingCriteria)EditorGUI.EnumFlagsField(rect, Styles.sortingCriteria, (SortingCriteria)m_SortingCriteria.intValue);
// EditorGUI.PropertyField(rect, m_SortingCriteria, Styles.sortingCriteria);
EditorGUI.PropertyField(rect, m_SortingCriteria, Styles.sortingCriteria);
rect.y += Styles.defaultLineSpace;

EditorGUI.indentLevel--;
Expand Down Expand Up @@ -210,8 +208,7 @@ void DoFilters(ref Rect rect)
EditorGUI.indentLevel++;
EditorGUI.BeginProperty(rect, Styles.renderQueueFilter, m_RenderQueue);
// There is still a bug with SerializedReference and PropertyField so we can't use it yet
// EditorGUI.PropertyField(rect, m_RenderQueue, Styles.renderQueueFilter);
m_RenderQueue.intValue = (int)(CustomPass.RenderQueueType)EditorGUI.EnumPopup(rect, Styles.renderQueueFilter, (CustomPass.RenderQueueType)m_RenderQueue.intValue);
EditorGUI.PropertyField(rect, m_RenderQueue, Styles.renderQueueFilter);
EditorGUI.EndProperty();
rect.y += Styles.defaultLineSpace;
if (ShowOpaqueObjectWarning())
Expand Down Expand Up @@ -260,9 +257,7 @@ void DoMaterialOverride(ref Rect rect)
else
{
EditorGUI.BeginProperty(rect, Styles.renderQueueFilter, m_RenderQueue);
// There is still a bug with SerializedReference and PropertyField so we can't use it yet
// EditorGUI.PropertyField(rect, m_ShaderPass, Styles.shaderPass);
m_ShaderPass.intValue = (int)(DrawRenderersCustomPass.ShaderPass)EditorGUI.EnumPopup(rect, Styles.shaderPass, (DrawRenderersCustomPass.ShaderPass)m_ShaderPass.intValue);
EditorGUI.PropertyField(rect, m_ShaderPass, Styles.shaderPass);
EditorGUI.EndProperty();
}
EditorGUI.indentLevel--;
Expand Down