HDRenderPipeline: Fix issue with Layered not taking heightmap into account + add update script for mateial keywords

Assets/ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs

 {
     public class HDRenderPipelineMenuItems
     {
+        // This script is a helper for the artits to re-synchronise all layered materials
         [MenuItem("HDRenderPipeline/Synchronize all Layered materials")]
         static void SynchronizeAllLayeredMaterial()
         {
             }
         }
 
-        [MenuItem("HDRenderPipeline/Update all materials keywords")]
-        static void UpdateAllMaterialKeywords()
+        static void RemoveMaterialKeywords(Material material)
+        {
+            string[] keywordsToRemove = material.shaderKeywords;
+            foreach (var keyword in keywordsToRemove) 
+            {
+                material.DisableKeyword(keyword);
+            }
+        }                 
+
+        // The goal of this script is to help maintenance of data that have already been produced but need to update to the latest shader code change.
+        // In case the shader code have change and the inspector have been update with new kind of keywords we need to regenerate the set of keywords use by the material.
+        // This script will remove all keyword of a material and trigger the inspector that will re-setup all the used keywords.
+        // It require that the inspector of the material have a static function call that update all keyword based on material properties.
+        [MenuItem("HDRenderPipeline/Reset all materials keywords")]
+        static void ResetAllMaterialKeywords()
-            Object[] materials = Resources.FindObjectsOfTypeAll<Material>();
-            foreach (Object obj in materials)
+            try
-                Material mat = obj as Material;
-                if (mat.shader.name == "HDRenderPipeline/LayeredLit" || mat.shader.name == "HDRenderPipeline/LayeredLitTessellation")
+                Object[] materials = Resources.FindObjectsOfTypeAll<Material>();
+                for (int i = 0, length = materials.Length; i < length; i++)
-                    LayeredLitGUI.SetupMaterialKeywordsAndPass(mat);
-                }
-                else if (mat.shader.name == "HDRenderPipeline/Lit" || mat.shader.name == "HDRenderPipeline/LitTessellation")
-                {
-                    LitGUI.SetupMaterialKeywordsAndPass(mat);
-                }
-                else if (mat.shader.name == "HDRenderPipeline/Unlit")
-                {
-                    UnlitGUI.SetupMaterialKeywordsAndPass(mat);
+                    Material mat = materials[i] as Material;
+
+                    EditorUtility.DisplayProgressBar(
+                        "Setup materials Keywords...",
+                        string.Format("{0} / {1} materials cleaned.", i, length),
+                        i / (float)(length - 1));
+
+                    if (mat.shader.name == "HDRenderPipeline/LayeredLit" || mat.shader.name == "HDRenderPipeline/LayeredLitTessellation")
+                    {
+                        // We remove all keyword already present
+                        RemoveMaterialKeywords(mat);
+                        LayeredLitGUI.SetupMaterialKeywordsAndPass(mat);
+                    }
+                    else if (mat.shader.name == "HDRenderPipeline/Lit" || mat.shader.name == "HDRenderPipeline/LitTessellation")
+                    {
+                        // We remove all keyword already present
+                        RemoveMaterialKeywords(mat);
+                        LitGUI.SetupMaterialKeywordsAndPass(mat);
+                    }
+                    else if (mat.shader.name == "HDRenderPipeline/Unlit")
+                    {
+                        // We remove all keyword already present
+                        RemoveMaterialKeywords(mat);
+                        UnlitGUI.SetupMaterialKeywordsAndPass(mat);
+                    }
+
+                    EditorUtility.SetDirty(mat);
+            }
+            finally
+            {
+                EditorUtility.ClearProgressBar();
             }
         }
     }

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/Editor/LayeredLitUI.cs

 
                 SetKeyword(material, "_DETAIL_MAP" + i, material.GetTexture(kDetailMap + i));
 
-                SetKeyword(material, "_HEIGHTMAP0" + i, material.GetTexture(kHeightMap + i));
+                SetKeyword(material, "_HEIGHTMAP" + i, material.GetTexture(kHeightMap + i));
             }
 
             SetKeyword(material, "_EMISSIVE_COLOR_MAP", material.GetTexture(kEmissiveColorMap));