Merge pull request #788 from Unity-Technologies/Branch_FixHeightMapUpdate

Branch fix height map update

SampleScenes/HDTest/AnimTest/Cube.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Cube
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.02
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _IOR: 1
     - _InitialBend: 1
     - _InvTilingScale: 4

SampleScenes/HDTest/AnimTest/NeoLowMan/Materials/body.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: body
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _ALBEDOAFFECTEMISSIVE_OFF _ALPHACUTOFFENABLE_OFF _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
+    _DEPTHOFFSETENABLE_OFF _DISTORTIONENABLE_OFF _DOUBLESIDEDENABLE_OFF _EMISSION
+    _ENABLEMOTIONVECTORFORVERTEXANIMATION_OFF _ENABLESPECULAROCCLUSION_OFF _ENABLEWIND_OFF
+    _NORMALMAP_TANGENT_SPACE _PREREFRACTIONPASS_OFF _TRANSPARENTBACKFACEENABLE_OFF
+    _TRANSPARENTDEPTHPOSTPASSENABLE_OFF _TRANSPARENTDEPTHPREPASSENABLE_OFF
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.02
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _IOR: 1
     - _InitialBend: 1
     - _InvTilingScale: 1

SampleScenes/HDTest/AnimTest/Sphere.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Sphere
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.02
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _IOR: 1
     - _InitialBend: 1
     - _InvTilingScale: 1.3333334

SampleScenes/HDTest/AnimTest/ThreeDScans/Gutenberg/Gutenberg.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Gutenberg
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _ALBEDOAFFECTEMISSIVE_OFF _ALPHACUTOFFENABLE_OFF _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
+    _DEPTHOFFSETENABLE_OFF _DETAIL_MULX2 _DISTORTIONENABLE_OFF _DOUBLESIDEDENABLE_OFF
+    _EMISSION _ENABLEMOTIONVECTORFORVERTEXANIMATION_OFF _ENABLESPECULAROCCLUSION_OFF
+    _ENABLEWIND_OFF _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE _PREREFRACTIONPASS_OFF
+    _TRANSPARENTBACKFACEENABLE_OFF _TRANSPARENTDEPTHPOSTPASSENABLE_OFF _TRANSPARENTDEPTHPREPASSENABLE_OFF
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.02
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _IOR: 1
     - _InitialBend: 1
     - _InvTilingScale: 1

SampleScenes/HDTest/AnimTest/ThreeDScans/Gutenberg/Materials/Gutenberg.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Gutenberg
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _ALBEDOAFFECTEMISSIVE_OFF _ALPHACUTOFFENABLE_OFF _DEPTHOFFSETENABLE_OFF
+    _DISTORTIONENABLE_OFF _DOUBLESIDEDENABLE_OFF _ENABLEMOTIONVECTORFORVERTEXANIMATION_OFF
+    _ENABLESPECULAROCCLUSION_OFF _ENABLEWIND_OFF _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+    _PREREFRACTIONPASS_OFF _TRANSPARENTBACKFACEENABLE_OFF _TRANSPARENTDEPTHPOSTPASSENABLE_OFF
+    _TRANSPARENTDEPTHPREPASSENABLE_OFF
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.02
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _IOR: 1
     - _InitialBend: 1
     - _InvTilingScale: 1

SampleScenes/HDTest/BasicProfiling/Lit_Regular.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Regular
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.01
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/BasicProfiling/Lit_Regular_Aniso.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Regular_Aniso
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.01
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/BasicProfiling/Lit_Regular_Aniso_Tess.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Regular_Aniso_Tess
   m_Shader: {fileID: 4800000, guid: 756bac9090102564582875f4c7e30202, type: 3}
-  m_ShaderKeywords: _HEIGHTMAP _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE _TESSELLATION_PHONG
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _HEIGHTMAP _MASKMAP _NORMALMAP
+    _NORMALMAP_TANGENT_SPACE _TESSELLATION_PHONG
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.67
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/BasicProfiling/Lit_Regular_Tess.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Regular_Tess
   m_Shader: {fileID: 4800000, guid: 756bac9090102564582875f4c7e30202, type: 3}
-  m_ShaderKeywords: _HEIGHTMAP _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE _TESSELLATION_PHONG
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _HEIGHTMAP _MASKMAP _NORMALMAP
+    _NORMALMAP_TANGENT_SPACE _TESSELLATION_PHONG
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.65
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/BasicProfiling/Lit_SSS.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_SSS
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MASKMAP _MATERIAL_FEATURE_SUBSURFACE_SCATTERING _MATERIAL_FEATURE_TRANSMISSION
-    _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MASKMAP _MATID_SSS _NORMALMAP
+    _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.01
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/BasicProfiling/Lit_SSS_Tess.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_SSS_Tess
   m_Shader: {fileID: 4800000, guid: 756bac9090102564582875f4c7e30202, type: 3}
-  m_ShaderKeywords: _HEIGHTMAP _MASKMAP _MATERIAL_FEATURE_SUBSURFACE_SCATTERING _MATERIAL_FEATURE_TRANSMISSION
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _HEIGHTMAP _MASKMAP _MATID_SSS
     _NORMALMAP _NORMALMAP_TANGENT_SPACE _TESSELLATION_PHONG
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 1.5
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/BasicProfiling/Lit_SpecColor.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_SpecColor
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MASKMAP _MATERIAL_FEATURE_ANISOTROPY _NORMALMAP _NORMALMAP_TANGENT_SPACE
-    _SPECULARCOLORMAP
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MASKMAP _MATID_ANISO _NORMALMAP
+    _NORMALMAP_TANGENT_SPACE _SPECULARCOLORMAP
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.01
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/BasicProfiling/Lit_SpecColor_Tess.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_SpecColor_Tess
   m_Shader: {fileID: 4800000, guid: 756bac9090102564582875f4c7e30202, type: 3}
-  m_ShaderKeywords: _HEIGHTMAP _MASKMAP _MATERIAL_FEATURE_ANISOTROPY _NORMALMAP _NORMALMAP_TANGENT_SPACE
-    _SPECULARCOLORMAP _TESSELLATION_PHONG
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _HEIGHTMAP _MASKMAP _MATID_ANISO
+    _NORMALMAP _NORMALMAP_TANGENT_SPACE _SPECULARCOLORMAP _TESSELLATION_PHONG
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 1.79
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/Data/Fern/Fern_01.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Fern_01
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _DOUBLESIDED_ON _MASKMAP _MATERIAL_FEATURE_SUBSURFACE_SCATTERING
-    _MATERIAL_FEATURE_TRANSMISSION _NORMALMAP _NORMALMAP_TANGENT_SPACE _THICKNESSMAP
-    _VERTEX_WIND
+  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DOUBLESIDED_ON
+    _MASKMAP _MATID_SSS _NORMALMAP _NORMALMAP_TANGENT_SPACE _THICKNESSMAP _VERTEX_WIND
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 1
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.02
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 0.1

SampleScenes/HDTest/Data/Rock/rcgRock012/Materials/rcgRock012Material.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: rcgRock012Material
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/Data/Tree/Thorn.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Thorn
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _DOUBLESIDED_ON _MATERIAL_FEATURE_SUBSURFACE_SCATTERING
-    _MATERIAL_FEATURE_TRANSMISSION _NORMALMAP _NORMALMAP_TANGENT_SPACE _VERTEX_WIND
+  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DOUBLESIDED_ON
+    _MATID_SSS _NORMALMAP _NORMALMAP_TANGENT_SPACE _VERTEX_WIND
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 1
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.01
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/Data/Tree/Tree_03_Branches.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Tree_03_Branches
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _ALPHATEST_ON _DOUBLESIDED_ON _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
-    _VERTEX_WIND
+  m_ShaderKeywords: _ALPHATEST_ON _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DOUBLESIDED_ON
+    _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE _VERTEX_WIND
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 1
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.01
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/Data/Tree/Tree_03_Trunk.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Tree_03_Trunk
   m_Shader: {fileID: 4800000, guid: 756bac9090102564582875f4c7e30202, type: 3}
-  m_ShaderKeywords: _DETAIL_MAP _HEIGHTMAP _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
-    _TESSELLATION_PHONG _VERTEX_WIND
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DETAIL_MAP _HEIGHTMAP _MASKMAP
+    _NORMALMAP _NORMALMAP_TANGENT_SPACE _TESSELLATION_PHONG _VERTEX_WIND
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.08
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/Data/Tree/Tree_03_Trunk_Layer.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Tree_03_Trunk_Layer
   m_Shader: {fileID: 4800000, guid: eab0538d9d5746246806a9611c04ac4d, type: 3}
-  m_ShaderKeywords: _DENSITY_MODE _DETAIL_MAP0 _HEIGHTMAP0 _LAYER_MASK_VERTEX_COLOR_ADD
-    _MASKMAP0 _NORMALMAP0 _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2
-    _NORMALMAP_TANGENT_SPACE3 _TESSELLATION_PHONG
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DENSITY_MODE _DETAIL_MAP0
+    _HEIGHTMAP0 _LAYER_MASK_VERTEX_COLOR_ADD _MASKMAP0 _NORMALMAP0 _NORMALMAP_TANGENT_SPACE0
+    _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2 _NORMALMAP_TANGENT_SPACE3
+    _TESSELLATION_PHONG
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
-    - _HeightMapParametrization0: 0
-    - _HeightMapParametrization1: 0
+    - _HeightMapParametrization0: 1
+    - _HeightMapParametrization1: 1
     - _HeightMapParametrization2: 0
     - _HeightMapParametrization3: 0
     - _HeightMax0: 1
     - _HeightMin1: -1
     - _HeightMin2: -1
     - _HeightMin3: -1
-    - _HeightOffset0: -1
-    - _HeightOffset1: -1
+    - _HeightOffset0: 0
+    - _HeightOffset1: 0
     - _HeightOffset2: 0
     - _HeightOffset3: 0
     - _HeightPoMAmplitude0: 2
     - _HeightTessAmplitude1: 2
     - _HeightTessAmplitude2: 2
     - _HeightTessAmplitude3: 2
-    - _HeightTessCenter0: 0
-    - _HeightTessCenter1: 0
+    - _HeightTessCenter0: 0.5
+    - _HeightTessCenter1: 0.5
     - _HeightTessCenter2: 0.5
     - _HeightTessCenter3: 0.5
     - _HeightTransition: 0

SampleScenes/HDTest/Data/Tree/Tree_03_Trunk_NoTesselation.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Tree_03_Trunk_NoTesselation
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _DETAIL_MAP _HEIGHTMAP _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
-    _VERTEX_WIND
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DETAIL_MAP _HEIGHTMAP _MASKMAP
+    _NORMALMAP _NORMALMAP_TANGENT_SPACE _VERTEX_WIND
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.08
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GIParityTest/LitColorsRough.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: LitColorsRough
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_SUBSURFACE_SCATTERING _MATERIAL_FEATURE_TRANSMISSION
-    _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_SSS _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.01
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GIParityTest/LitWhiteRough.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: LitWhiteRough
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_SUBSURFACE_SCATTERING _MATERIAL_FEATURE_TRANSMISSION
-    _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_SSS _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.01
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GammaTest/Lit_Gray_127.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Gray_127
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_SUBSURFACE_SCATTERING _MATERIAL_FEATURE_TRANSMISSION
-    _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_SSS _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.01
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GammaTest/Lit_Gray_127_sRGB.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Gray_127_sRGB
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_SUBSURFACE_SCATTERING _MATERIAL_FEATURE_TRANSMISSION
-    _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_SSS _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.01
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GlobalIlluminationTest/Material/Chrome.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Chrome
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_SUBSURFACE_SCATTERING _MATERIAL_FEATURE_TRANSMISSION
-    _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_SSS _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.01
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GlobalIlluminationTest/Material/Lit_Green.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Green
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GlobalIlluminationTest/Material/Lit_Grey.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Grey
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.01
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GlobalIlluminationTest/Material/Lit_Red.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Red
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonNormalOS.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: DragonNormalOS
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _EnableWind: 0
     - _HeightAmplitude: 0.01
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonNormalTS.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: DragonNormalTS
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _EnableWind: 0
     - _HeightAmplitude: 0.01
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonStatue.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: DragonStatue
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _HEIGHTMAP _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _HEIGHTMAP _MASKMAP _NORMALMAP
+    _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0
     - _HeightCenter: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
     - _HeightMax: 1
     - _HeightMin: -1
     - _HeightOffset: 0

SampleScenes/HDTest/GraphicTest/Common/Dragon/DragonStatueSpecular.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: DragonStatueSpecular
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _HEIGHTMAP _MASKMAP _MATERIAL_FEATURE_SPECULAR_COLOR _NORMALMAP
-    _NORMALMAP_TANGENT_SPACE _SPECULARCOLORMAP
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _HEIGHTMAP _MASKMAP _MATID_SPECULAR
+    _NORMALMAP _NORMALMAP_TANGENT_SPACE _SPECULARCOLORMAP
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _GlossyReflections: 1
     - _HeightAmplitude: 0.02
     - _HeightCenter: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
     - _HeightMax: 1
     - _HeightMin: -1
     - _HeightOffset: 0

SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Blue.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Blue
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_Blue.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Checker_Blue
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_Green.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Checker_Green
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_Red.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Checker_Red
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Checker_White.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Checker_White
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Green.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Green
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Lit_Red.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Red
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Lit_White.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_White
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_0.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smooth0_0
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_1.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smooth0_1
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_2.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smooth0_2
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_3.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smooth0_3
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_4.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smooth0_4
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_5.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smooth0_5
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_6.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smooth0_6
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_7.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smooth0_7
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_8.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smooth0_8
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth0_9.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smooth0_9
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smooth1_0.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smooth1_0
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_0.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smoothdielectric0_0
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_1.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smoothdielectric0_1
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_2.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smoothdielectric0_2
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_3.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smoothdielectric0_3
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_4.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smoothdielectric0_4
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_5.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smoothdielectric0_5
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_6.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smoothdielectric0_6
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_7.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smoothdielectric0_7
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_8.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smoothdielectric0_8
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric0_9.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smoothdielectric0_9
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Coat_smoothdielectric1_0.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Coat_smoothdielectric1_0
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _MATID_CLEARCOAT _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_2DNoise.mat

     - _EnableWind: 0
     - _HeightAmplitude: 0.01
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _IOR: 1
     - _InitialBend: 1
     - _InvTilingScale: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Distorsion_Lit_2DNoise_PreTransparent.mat

     - _EnableWind: 0
     - _HeightAmplitude: 0.01
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _IOR: 1
     - _InitialBend: 1
     - _InvTilingScale: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_Mirror.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_Mirror
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _EnableWind: 0
     - _HeightAmplitude: 0.02
     - _HeightCenter: 0.5
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _IOR: 1
     - _InitialBend: 1
     - _InvTilingScale: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_plane_Clear_ior101.mat

     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1.01
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_plane_Clear_ior15.mat

     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1.5
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_plane_Dragon.mat

     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1.04
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_plane_EarthMap.mat

     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1.5
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_Clear_ior101.mat

     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1.01
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_Clear_ior15.mat

     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1.5
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_Dragon.mat

     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1.04
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_EarthMap.mat

     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1.5
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_EarthMap_RefractionMask.mat

     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1.5
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_refraction_sphere_EarthMap_pretransparent.mat

     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1.5
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_0.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smooth0_0
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_1.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smooth0_1
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_2.mat

     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_3.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smooth0_3
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_4.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smooth0_4
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_5.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smooth0_5
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_6.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smooth0_6
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_7.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smooth0_7
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_8.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smooth0_8
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth0_9.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smooth0_9
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smooth1_0.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smooth1_0
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_0.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smoothdielectric0_0
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_1.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smoothdielectric0_1
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_2.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smoothdielectric0_2
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_3.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smoothdielectric0_3
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_4.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smoothdielectric0_4
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_5.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smoothdielectric0_5
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_6.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smoothdielectric0_6
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_7.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smoothdielectric0_7
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_8.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smoothdielectric0_8
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric0_9.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smoothdielectric0_9
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_smoothdielectric1_0.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Mat_smoothdielectric1_0
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_transparent_blend_add.mat

     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1.5
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_transparent_blend_alphablend.mat

     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1.5
     - _InitialBend: 1

SampleScenes/HDTest/GraphicTest/Common/Material/Mat_transparent_blend_multiply.mat

     - _HeightBias: 0
     - _HeightCenter: 0.5
     - _HeightMapMode: 0
-    - _HeightMapParametrization: 0
+    - _HeightMapParametrization: 1
-    - _HeightOffset: -1
+    - _HeightOffset: 0
-    - _HeightTessCenter: 0
+    - _HeightTessCenter: 0.5
     - _HorizonFade: 1
     - _IOR: 1.5
     - _InitialBend: 1