Fix custom pass reorder (#1153)

* Fixed custom pass re-ordering issues

* Updated changelog

Co-authored-by: sebastienlagarde <[email protected]>

Author: Antoine Lelievre

com.unity.render-pipelines.high-definition/CHANGELOG.md

@@ -727,6 +727,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed regression where moving face of the probe gizmo was not moving its position anymore.
 - Fixed XR single-pass macros in tessellation shaders.
 - Fixed path-traced subsurface scattering mixing with diffuse and specular BRDFs (1250601).
+- Fixed custom pass re-ordering issues.
 
 ### Changed
 - Improve MIP selection for decals on Transparents

com.unity.render-pipelines.high-definition/Editor/RenderPipeline/CustomPass/CustomPassVolumeEditor.cs

@@ -103,12 +103,12 @@ void DrawMaterialsGUI()
             m_CustomPassMaterialsHash = materialsHash;
         }
 
-        Dictionary<SerializedProperty, CustomPassDrawer> customPassDrawers = new Dictionary<SerializedProperty, CustomPassDrawer>();
-        CustomPassDrawer GetCustomPassDrawer(SerializedProperty pass, int listIndex)
+        Dictionary<CustomPass, CustomPassDrawer> customPassDrawers = new Dictionary<CustomPass, CustomPassDrawer>();
+        CustomPassDrawer GetCustomPassDrawer(SerializedProperty pass, CustomPass reference, int listIndex)
         {
             CustomPassDrawer drawer;
 
-            if (customPassDrawers.TryGetValue(pass, out drawer))
+            if (customPassDrawers.TryGetValue(reference, out drawer))
                 return drawer;
 
             var customPass = m_Volume.customPasses[listIndex];
@@ -132,7 +132,7 @@ CustomPassDrawer GetCustomPassDrawer(SerializedProperty pass, int listIndex)
                 }
             }
 
-            customPassDrawers[pass] = drawer;
+            customPassDrawers[reference] = drawer;
 
             return drawer;
         }
@@ -193,8 +193,9 @@ void CreateReorderableList(SerializedProperty passList)
             m_CustomPassList.drawElementCallback = (rect, index, active, focused) => {
                 EditorGUI.BeginChangeCheck();
 
+                passList.serializedObject.ApplyModifiedProperties();
                 var customPass = passList.GetArrayElementAtIndex(index);
-                var drawer = GetCustomPassDrawer(customPass, index);
+                var drawer = GetCustomPassDrawer(customPass, m_Volume.customPasses[index], index);
                 if (drawer != null)
                     drawer.OnGUI(rect, customPass, null);
                 else
@@ -205,8 +206,9 @@ void CreateReorderableList(SerializedProperty passList)
 
             m_CustomPassList.elementHeightCallback = (index) =>
             {
+                passList.serializedObject.ApplyModifiedProperties();
                 var customPass = passList.GetArrayElementAtIndex(index);
-                var drawer = GetCustomPassDrawer(customPass, index);
+                var drawer = GetCustomPassDrawer(customPass, m_Volume.customPasses[index], index);
                 if (drawer != null)
                     return drawer.GetPropertyHeight(customPass, null);
                 else
@@ -223,10 +225,10 @@ void CreateReorderableList(SerializedProperty passList)
                         continue;
 
                     menu.AddItem(new GUIContent(customPassType.Name), false, () => {
-                        passList.serializedObject.Update();
+                        passList.serializedObject.ApplyModifiedProperties();
                         m_Volume.AddPassOfType(customPassType);
                         UpdateMaterialEditors();
-                        passList.serializedObject.ApplyModifiedProperties();
+                        passList.serializedObject.Update();
                         // Notify the prefab that something have changed:
                         PrefabUtility.RecordPrefabInstancePropertyModifications(target);
                    });
@@ -235,11 +237,25 @@ void CreateReorderableList(SerializedProperty passList)
 			};
 
             m_CustomPassList.onRemoveCallback = (list) => {
-                passList.serializedObject.Update();
+                passList.serializedObject.ApplyModifiedProperties();
                 Undo.RegisterCompleteObjectUndo(target, "Remove custom pass");
                 m_Volume.customPasses.RemoveAt(list.index);
                 UpdateMaterialEditors();
+                passList.serializedObject.Update();
+                // Notify the prefab that something have changed:
+                PrefabUtility.RecordPrefabInstancePropertyModifications(target);
+            };
+
+            m_CustomPassList.onReorderCallbackWithDetails = (list, oldIndex, newIndex) => {
+                customPassDrawers.Clear();
                 passList.serializedObject.ApplyModifiedProperties();
+                Undo.RegisterCompleteObjectUndo(target, "Reorder custom pass");
+
+                var t = m_Volume.customPasses[oldIndex];
+                m_Volume.customPasses[oldIndex] = m_Volume.customPasses[newIndex];
+                m_Volume.customPasses[newIndex] = t;
+
+                passList.serializedObject.Update();
                 // Notify the prefab that something have changed:
                 PrefabUtility.RecordPrefabInstancePropertyModifications(target);
             };