Fix reorderable list issue (#349)

martint-unity · phi-lira · web-flow · commit 87262642302a · 2020-05-14T10:05:53.000+02:00
* [universal] fix for case #1205224

Removed the reorderable list and replaced it with a normal list for the ui

* Updated changelog

Co-authored-by: Felipe Lira &lt;felipedrl@gmail.com&gt;
diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md
@@ -187,6 +187,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed SceneView Draw Modes not being properly updated after opening new scene view panels or changing the editor layout.
 - Fixed GLES shaders compilation failing on Windows platform (not a mobile platform) due to uniform count limit.
 - Fixed an issue that caused the inverse view and projection matrix to output wrong values in some platforms. [case 1243990](https://issuetracker.unity3d.com/issues/urp-8-dot-1-breaks-unity-matrix-i-vp)
+- 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
diff --git 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<SerializedObject> m_properties = new List<SerializedObject>();
 
         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)
