[7.x.x] backport #349 fix renderpass list

com.unity.render-pipelines.universal/CHANGELOG.md

@@ -34,6 +34,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed an issue where the emission value in particle shaders would not update in the editor without entering playmode.
 - 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 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.3.0] - 2020-03-11
 

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,28 +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);
-                var labelWidth = EditorGUIUtility.labelWidth;
-                EditorGUIUtility.labelWidth = 50;
-                element.stringValue = EditorGUI.TextField(propRect, "Name", element.stringValue);
-                EditorGUIUtility.labelWidth = labelWidth;
-            };
-
-            m_ShaderPassesList.drawHeaderCallback = (Rect testHeaderRect) =>
-            {
-                EditorGUI.LabelField(testHeaderRect, Styles.shaderPassFilter);
-            };
         }
 
         public override void OnGUI(Rect rect, SerializedProperty property, GUIContent label)
@@ -201,9 +178,9 @@ void DoFilters(ref Rect rect)
 			    EditorGUI.PropertyField(rect, m_LayerMask, Styles.layerMask);
 			    rect.y += Styles.defaultLineSpace;
 			    //Shader pass list
+                EditorGUI.PropertyField(rect, m_ShaderPasses, Styles.shaderPassFilter, true);
+                rect.y += EditorGUI.GetPropertyHeight(m_ShaderPasses);
 			    EditorGUI.indentLevel--;
-			    m_ShaderPassesList.DoList(rect);
-			    rect.y += m_ShaderPassesList.GetHeight();
 		    }
 	    }
 
@@ -270,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)