From f997aef028742799ea3d196149d4b7bb58293390 Mon Sep 17 00:00:00 2001 From: martint-unity Date: Mon, 4 May 2020 10:58:25 +0200 Subject: [PATCH 1/2] [universal] fix for case #1205224 Removed the reorderable list and replaced it with a normal list for the ui --- .../RenderObjectsPassFeatureEditor.cs | 30 ++++--------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/com.unity.render-pipelines.universal/Editor/RendererFeatures/RenderObjectsPassFeatureEditor.cs b/com.unity.render-pipelines.universal/Editor/RendererFeatures/RenderObjectsPassFeatureEditor.cs index 7650c85487d..57a9c5c3148 100644 --- a/com.unity.render-pipelines.universal/Editor/RendererFeatures/RenderObjectsPassFeatureEditor.cs +++ b/com.unity.render-pipelines.universal/Editor/RendererFeatures/RenderObjectsPassFeatureEditor.cs @@ -71,7 +71,6 @@ internal class Styles private SerializedProperty m_CameraOffset; private SerializedProperty m_RestoreCamera; - private ReorderableList m_ShaderPassesList; private List m_properties = new List(); private void Init(SerializedProperty property) @@ -111,25 +110,6 @@ private void Init(SerializedProperty property) m_RestoreCamera = m_CameraSettings.FindPropertyRelative("restoreCamera"); m_properties.Add(property.serializedObject); - CreateShaderPassList(); - } - - private void CreateShaderPassList() - { - m_ShaderPassesList = new ReorderableList(null, m_ShaderPasses, false, true, true, true); - - m_ShaderPassesList.drawElementCallback = - (Rect rect, int index, bool isActive, bool isFocused) => - { - var element = m_ShaderPassesList.serializedProperty.GetArrayElementAtIndex(index); - var propRect = new Rect(rect.x, rect.y, rect.width, EditorGUIUtility.singleLineHeight); - element.stringValue = EditorGUI.TextField(propRect, "", element.stringValue); - }; - - m_ShaderPassesList.drawHeaderCallback = (Rect testHeaderRect) => - { - EditorGUI.LabelField(testHeaderRect, Styles.shaderPassFilter); - }; } public override void OnGUI(Rect rect, SerializedProperty property, GUIContent label) @@ -198,10 +178,10 @@ void DoFilters(ref Rect rect) EditorGUI.PropertyField(rect, m_LayerMask, Styles.layerMask); rect.y += Styles.defaultLineSpace; //Shader pass list - EditorGUI.indentLevel--; - m_ShaderPassesList.DoList(rect); - rect.y += m_ShaderPassesList.GetHeight(); - } + EditorGUI.PropertyField(rect, m_ShaderPasses, Styles.shaderPassFilter, true); + rect.y += EditorGUI.GetPropertyHeight(m_ShaderPasses); + EditorGUI.indentLevel--; + } } void DoMaterialOverride(ref Rect rect) @@ -267,7 +247,7 @@ public override float GetPropertyHeight(SerializedProperty property, GUIContent Init(property); height += Styles.defaultLineSpace * (m_FiltersFoldout.value ? m_FilterLines : 1); - height += m_FiltersFoldout.value ? m_ShaderPassesList.GetHeight() : 0; + height += m_FiltersFoldout.value ? EditorGUI.GetPropertyHeight(m_ShaderPasses) : 0; height += Styles.defaultLineSpace; // add line for overrides dropdown if (m_RenderFoldout.value) From 9cfdd912237472a66dfee6e16f97b24004f3e342 Mon Sep 17 00:00:00 2001 From: martint-unity Date: Mon, 4 May 2020 12:10:22 +0200 Subject: [PATCH 2/2] Updated changelog --- com.unity.render-pipelines.universal/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index 4e5a7d3a3db..fe0898b0ae4 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -182,6 +182,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed an issue where grid lines were being drawn on top of opaque objects in the preview window [case 1240723](https://issuetracker.unity3d.com/issues/urp-grid-is-rendered-in-front-of-the-model-in-the-inspector-animation-preview-window-when-depth-or-opaque-texture-is-enabled) - Fixed an issue where objects in the preview window were being affected by layer mask settings in the default renderer [case 1204376](https://issuetracker.unity3d.com/issues/urp-prefab-preview-is-blank-when-a-custom-forward-renderer-data-and-default-layer-mask-is-mixed-are-used) - Fixed an issue with reflections when using an orthographic camera [case 1209255](https://issuetracker.unity3d.com/issues/urp-weird-reflections-when-using-lit-material-and-a-camera-with-orthographic-projection) +- Fixed an issue with not being able to remove Light Mode Tags [case 1240895](https://issuetracker.unity3d.com/issues/urp-unable-to-remove-added-lightmode-tags-of-filters-property-in-render-object) ## [7.1.1] - 2019-09-05 ### Upgrade Guide