Merge pull request #91 from Unity-Technologies/Branch_update-layered-test-scene

Updated LayeredLit test scene with latest changes.

Assets/TestScenes/HDTest/LayeredLitTest.unity

   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 112888599}
   m_LocalRotation: {x: 0.4442191, y: -0, z: -0, w: 0.8959182}
-  m_LocalPosition: {x: -41.31, y: -1.55, z: 13.03}
+  m_LocalPosition: {x: -41.514, y: -1.55, z: 12.008}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1732353142}
       format: 0
       dimension: 4
     m_DataSize: 2200
-    _typelessdata: 020020c1feff1fc10000002900000000000000000000803ffffefe3efffefe3efffefe3e0000803ffeff7f3f00000033d4fd4d3e9c3c10be326ca43fe8df5bbf0000003f0000003f000080bf0000000000000000000080bf0300a0c0ffff1fc17cac6a3400000000000000000000803f8848fc3efffefe3efffefe3e0000803fffff3f3f0000003370deec3d2ca6c03d52aa3f3f061e37bf0000003f0000003f000080bf0000000000000000000080bf0200a0c0feff9fc00000802800000000000000000000803ffffefe3efffefe3efffefe3e0000803fffff3f3f0000803e757fb33eb2e1373e326c643fd0bf37be0000003f0000003f000080bf0000000000000000000080bf010020c1fdff9fc079ac6ab400000000000000000000803ffffefe3efffefe3efffefe3e0000803ffeff7f3f0000803ec346df3e00b862bd23cdb63fa863a5be0000003f0000003f000080bf0000000000000000000080bf0000a0c01fab5a357aac6ab400000000000000000000803ffffefe3efffefe3efffefe3e0000803f0000403fffffff3ea7e3153f27b8873e0a97843f3f7cb63e0000003f0000003f000080bf0000000000000000000080bf000020c11fabda357aaceab400000000000000000000803ffffefe3efffefe3efffefe3e0000803fffff7f3fffffff3e4ec72b3fe004f73c132ec93ffcf0593e0000003f0000003f000080bf0000000000000000000080bffeff9fc00200a0407aaceab400000000000000000000803f8b3ade3cfffefe3efffefe3e0000803f0000403fffff3f3f9407523f757fb33efaf7963f326c643f0000003f0000003f000080bf0000000000000000000080bfffff1fc10300a0405c0130b500000000000000000000803ffffefe3efffefe3efffefe3e0000803f0000803fffff3f3f3aeb673f70deec3d038fdb3f52aa3f3f0000003f0000003f000080bf0000000000000000000080bffdff9fc0010020415c0130b500000000000000000000803ffffefe3efffefe3efffefe3e0000803f0000403ffeff7f3fc015873fc346df3eea58a93f23cdb63f0000003f0000003f000080bf0000000000000000000080bffeff1fc1020020417aac6ab500000000000000000000803ffffefe3efffefe3efffefe3e0000803f0000803ffeff7f3f9407923fd4fd4d3ef4efed3f326ca43f0000003f0000003f000080bf0000000000000000000080bf1fab5ab50000a0c07bac6a3400000000000000000000803ffffefe3efffefe3efffefe3e0000803fffffff3e0100803e27b8873eb238d43e3f7cb63e30e112bd0000003f0000003f000080bf0000000000000000000080bf1fabdab5000020c17bacea3400000000000000000000803f7994f23efffefe3efffefe3e0000803fffffff3e00008033e004f73c6471a83efcf0593e265c12bf0000003f0000003f000080bf0000000000000000000080bf00000000000000000000000000000000000000000000803ffffefe3efffefe3efffefe3e0000803f0000003f0000003f0000003f0000003f0000003f0000003f0000003f0000003f000080bf0000000000000000000080bf1fab5a350000a0407bac6ab400000000000000000000803ffffefe3efffefe3efffefe3e0000803f0000003f0000403fec233c3fa7e3153fe0c1243f0a97843f0000003f0000003f000080bf0000000000000000000080bf1fabda35000020417baceab400000000000000000000803ffffefe3efffefe3efffefe3e0000803f0100003fffff7f3fd947783f4ec72b3fc183493f132ec93f0000003f0000003f000080bf0000000000000000000080bffeff9f400200a0c07aacea3400000000000000000000803f876de337da4f563eda4f563e0000803f0000803e0200803eb2e1373e4640263fd0bf37be6c9edc3d0000003f0000003f000080bf0000000000000000000080bffdff9f40010020c15c01303500000000000000000000803ff0d72e38fffefe3efffefe3e0000803f0000803e0000c03300b862bd9e5c103fa863a5be8c34dbbe0000003f0000003f000080bf0000000000000000000080bf0000a0401fab5ab57aac6a3400000000000000000000803ffffefe3efffefe3efffefe3e0000803f0100803e0000003fb238d43eec233c3f30e112bde0c1243f0000003f0000003f000080bf0000000000000000000080bf0200a040feff9f40000080a800000000000000000000803ffffefe3efffefe3efffefe3e0000803f0200803e0000403f4640263f9407523f6c9edc3dfaf7963f0000003f0000003f000080bf0000000000000000000080bf0300a040ffff1f417cac6ab400000000000000000000803ffffefe3efffefe3efffefe3e0000803f0200803e0000803f3264623f3aeb673f5cab803e038fdb3f0000003f0000003f000080bf0000000000000000000080bfffff1f410300a0c05c01303500000000000000000000803f59fb0d30fffefe3efffefe3e0000803f000000330200803e2ca6c03d3264623f061e37bf5cab803e0000003f0000003f000080bf0000000000000000000080bffeff1f41020020c17aac6a3500000000000000000000803fdc5cbd3afffefe3efffefe3e0000803f000000330000c0339c3c10be8b804c3fe8df5bbfcab091be0000003f0000003f000080bf0000000000000000000080bf000020411fabdab57aacea3400000000000000000000803ffffefe3efffefe3efffefe3e0000803f000080330100003f6471a83ed947783f265c12bfc183493f0000003f0000003f000080bf0000000000000000000080bf01002041fdff9f4079ac6a3400000000000000000000803ffffefe3efffefe3efffefe3e0000803f0000c0330000403f9e5c103fc015873f8c34dbbeea58a93f0000003f0000003f000080bf0000000000000000000080bf02002041feff1f41000000a900000000000000000000803ffffefe3efffefe3efffefe3e0000803f0000c0330000803f8b804c3f9407923fcab091bef4efed3f0000003f0000003f000080bf0000000000000000000080bf
+    _typelessdata: 020020c1feff1fc10000002900000000000000000000803ffffefe3efffefe3efffefe3e0000803ffeff7f3f00000033d4fd4d3e9c3c10be326ca43fe8df5bbf0000003f0000003f000080bf0000000000000000000080bf0300a0c0ffff1fc17cac6a3400000000000000000000803ffffefe3efffefe3efffefe3e0000803fffff3f3f0000003370deec3d2ca6c03d52aa3f3f061e37bf0000003f0000003f000080bf0000000000000000000080bf0200a0c0feff9fc00000802800000000000000000000803ffffefe3efffefe3efffefe3e0000803fffff3f3f0000803e757fb33eb2e1373e326c643fd0bf37be0000003f0000003f000080bf0000000000000000000080bf010020c1fdff9fc079ac6ab400000000000000000000803ffffefe3efffefe3efffefe3e0000803ffeff7f3f0000803ec346df3e00b862bd23cdb63fa863a5be0000003f0000003f000080bf0000000000000000000080bf0000a0c01fab5a357aac6ab400000000000000000000803ffffefe3efffefe3efffefe3e0000803f0000403fffffff3ea7e3153f27b8873e0a97843f3f7cb63e0000003f0000003f000080bf0000000000000000000080bf000020c11fabda357aaceab400000000000000000000803ffffefe3efffefe3efffefe3e0000803fffff7f3fffffff3e4ec72b3fe004f73c132ec93ffcf0593e0000003f0000003f000080bf0000000000000000000080bffeff9fc00200a0407aaceab400000000000000000000803ffffefe3efffefe3efffefe3e0000803f0000403fffff3f3f9407523f757fb33efaf7963f326c643f0000003f0000003f000080bf0000000000000000000080bfffff1fc10300a0405c0130b500000000000000000000803ffffefe3efffefe3efffefe3e0000803f0000803fffff3f3f3aeb673f70deec3d038fdb3f52aa3f3f0000003f0000003f000080bf0000000000000000000080bffdff9fc0010020415c0130b500000000000000000000803ffffefe3efffefe3efffefe3e0000803f0000403ffeff7f3fc015873fc346df3eea58a93f23cdb63f0000003f0000003f000080bf0000000000000000000080bffeff1fc1020020417aac6ab500000000000000000000803ffffefe3efffefe3efffefe3e0000803f0000803ffeff7f3f9407923fd4fd4d3ef4efed3f326ca43f0000003f0000003f000080bf0000000000000000000080bf1fab5ab50000a0c07bac6a3400000000000000000000803ffffefe3efffefe3efffefe3e0000803fffffff3e0100803e27b8873eb238d43e3f7cb63e30e112bd0000003f0000003f000080bf0000000000000000000080bf1fabdab5000020c17bacea3400000000000000000000803ffffefe3efffefe3efffefe3e0000803fffffff3e00008033e004f73c6471a83efcf0593e265c12bf0000003f0000003f000080bf0000000000000000000080bf00000000000000000000000000000000000000000000803ffffefe3efffefe3efffefe3e0000803f0000003f0000003f0000003f0000003f0000003f0000003f0000003f0000003f000080bf0000000000000000000080bf1fab5a350000a0407bac6ab400000000000000000000803ffffefe3efffefe3efffefe3e0000803f0000003f0000403fec233c3fa7e3153fe0c1243f0a97843f0000003f0000003f000080bf0000000000000000000080bf1fabda35000020417baceab400000000000000000000803ffffefe3efffefe3efffefe3e0000803f0100003fffff7f3fd947783f4ec72b3fc183493f132ec93f0000003f0000003f000080bf0000000000000000000080bffeff9f400200a0c07aacea3400000000000000000000803ffffefe3efffefe3efffefe3e0000803f0000803e0200803eb2e1373e4640263fd0bf37be6c9edc3d0000003f0000003f000080bf0000000000000000000080bffdff9f40010020c15c01303500000000000000000000803ffffefe3efffefe3efffefe3e0000803f0000803e0000c03300b862bd9e5c103fa863a5be8c34dbbe0000003f0000003f000080bf0000000000000000000080bf0000a0401fab5ab57aac6a3400000000000000000000803ffffefe3efffefe3efffefe3e0000803f0100803e0000003fb238d43eec233c3f30e112bde0c1243f0000003f0000003f000080bf0000000000000000000080bf0200a040feff9f40000080a800000000000000000000803ffffefe3efffefe3efffefe3e0000803f0200803e0000403f4640263f9407523f6c9edc3dfaf7963f0000003f0000003f000080bf0000000000000000000080bf0300a040ffff1f417cac6ab400000000000000000000803ffffefe3efffefe3efffefe3e0000803f0200803e0000803f3264623f3aeb673f5cab803e038fdb3f0000003f0000003f000080bf0000000000000000000080bfffff1f410300a0c05c01303500000000000000000000803ffffefe3efffefe3efffefe3e0000803f000000330200803e2ca6c03d3264623f061e37bf5cab803e0000003f0000003f000080bf0000000000000000000080bffeff1f41020020c17aac6a3500000000000000000000803ffffefe3efffefe3efffefe3e0000803f000000330000c0339c3c10be8b804c3fe8df5bbfcab091be0000003f0000003f000080bf0000000000000000000080bf000020411fabdab57aacea3400000000000000000000803ffffefe3efffefe3efffefe3e0000803f000080330100003f6471a83ed947783f265c12bfc183493f0000003f0000003f000080bf0000000000000000000080bf01002041fdff9f4079ac6a3400000000000000000000803ffffefe3efffefe3efffefe3e0000803f0000c0330000403f9e5c103fc015873f8c34dbbeea58a93f0000003f0000003f000080bf0000000000000000000080bf02002041feff1f41000000a900000000000000000000803ffffefe3efffefe3efffefe3e0000803f0000c0330000803f8b804c3f9407923fcab091bef4efed3f0000003f0000003f000080bf0000000000000000000080bf
   m_CompressedMesh:
     m_Vertices:
       m_NumItems: 0
     - {x: -0.28455192, y: 1.8588853}
     _colors:
     - {r: 0.49803922, g: 0.49803922, b: 0.49803922, a: 1}
-    - {r: 0.49274087, g: 0.49803922, b: 0.49803922, a: 1}
-    - {r: 0.027127525, g: 0.49803922, b: 0.49803922, a: 1}
-    - {r: 0.473789, g: 0.49803922, b: 0.49803922, a: 1}
-    - {r: 0.000027111511, g: 0.20928898, b: 0.20928898, a: 1}
-    - {r: 0.00004168594, g: 0.49803922, b: 0.49803922, a: 1}
-    - {r: 5.165269e-10, g: 0.49803922, b: 0.49803922, a: 1}
-    - {r: 0.001444723, g: 0.49803922, b: 0.49803922, a: 1}
+    - {r: 0.49803922, g: 0.49803922, b: 0.49803922, a: 1}
+    - {r: 0.49803922, g: 0.49803922, b: 0.49803922, a: 1}
+    - {r: 0.49803922, g: 0.49803922, b: 0.49803922, a: 1}
+    - {r: 0.49803922, g: 0.49803922, b: 0.49803922, a: 1}
+    - {r: 0.49803922, g: 0.49803922, b: 0.49803922, a: 1}
+    - {r: 0.49803922, g: 0.49803922, b: 0.49803922, a: 1}
+    - {r: 0.49803922, g: 0.49803922, b: 0.49803922, a: 1}
     - {r: 0.49803922, g: 0.49803922, b: 0.49803922, a: 1}
     - {r: 0.49803922, g: 0.49803922, b: 0.49803922, a: 1}
     - {r: 0.49803922, g: 0.49803922, b: 0.49803922, a: 1}

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_HeightBased.mat

     - _AlphaCutoff: 0.5
     - _AlphaCutoffEnable: 0
     - _BlendMode: 0
-    - _BlendSize1: 0.0035
-    - _BlendSize2: 0.0034
-    - _BlendSize3: 0.0018
+    - _BlendSize1: 0.023
+    - _BlendSize2: 0.011
+    - _BlendSize3: 0.008
     - _BumpScale: 1
     - _CullMode: 2
     - _Cutoff: 0.5
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
+    - _HeightAmplitude0: 0.25
+    - _HeightAmplitude1: 0.15
+    - _HeightAmplitude2: 0.1
+    - _HeightAmplitude3: 0.15
-    - _HeightFactor1: 1.81
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0.5
+    - _HeightCenter3: 0.5
+    - _HeightFactor1: 1
-    - _HeightFactor3: 0.62
+    - _HeightFactor3: 1
-    - _HeightOffset1: -0.003
-    - _HeightOffset2: 0.01
-    - _HeightOffset3: 0.003
+    - _HeightOffset1: 0.057
+    - _HeightOffset2: 0.015
+    - _HeightOffset3: 0
     - _HeightScale0: 0.127
     - _HeightScale1: 0.1
     - _HeightScale2: 0.05
     - _Metallic3: 0
     - _Mode: 0
     - _NormalMapSpace: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _UseHeightBasedBlend1: 1
     - _UseHeightBasedBlend2: 1
     - _UseHeightBasedBlend3: 1
-    - _VertexColorHeightFactor: 0.19
+    - _VertexColorHeightFactor: 0.3
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer0_Planar.mat

   m_Name: Layered_Layer0_Planar
   m_Shader: {fileID: 4800000, guid: 81d02e8644315b742b154842a3a2f98c, type: 3}
   m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
-    _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MAPPING_TRIPLANAR_0 _LAYER_MASK_VERTEX_COLOR
+    _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MASK_VERTEX_COLOR _LAYER_MASK_VERTEX_COLOR_MUL
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - DistortionVectors
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 1
+    - _HeightAmplitude3: 1
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0
+    - _HeightCenter3: 0
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _InheritBaseLayer1: 0
+    - _InheritBaseLayer2: 0
+    - _InheritBaseLayer3: 0
     - _LayerCount: 2
     - _LayerMaskVertexColor: 1
     - _Metallic: 0
     - _Metallic3: 0
     - _Mode: 0
     - _NormalMapSpace: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _UVDetailsMappingMask1: 0
     - _UVDetailsMappingMask2: 0
     - _UVDetailsMappingMask3: 0
-    - _UVMappingPlanar0: 0
+    - _UVMappingPlanar0: 1
+    - _UseHeightBasedBlend: 0
+    - _VertexColorHeightFactor: 0.3
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer0_Triplanar.mat

   m_Shader: {fileID: 4800000, guid: 81d02e8644315b742b154842a3a2f98c, type: 3}
   m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
     _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MAPPING_TRIPLANAR_0 _LAYER_MASK_VERTEX_COLOR
-    _NORMALMAP_TANGENT_SPACE
+    _LAYER_MASK_VERTEX_COLOR_MUL _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_CustomRenderQueue: -1
   stringTagMap: {}
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 1
+    - _HeightAmplitude3: 1
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0
+    - _HeightCenter3: 0
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _InheritBaseLayer1: 0
+    - _InheritBaseLayer2: 0
+    - _InheritBaseLayer3: 0
     - _LayerCount: 2
     - _LayerMaskVertexColor: 1
     - _Metallic: 0
     - _Metallic3: 0
     - _Mode: 0
     - _NormalMapSpace: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
     - _UVSec: 0
+    - _UseHeightBasedBlend: 0
+    - _VertexColorHeightFactor: 0.3
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer0_UV0.mat

   m_Name: Layered_Layer0_UV0
   m_Shader: {fileID: 4800000, guid: 81d02e8644315b742b154842a3a2f98c, type: 3}
   m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
-    _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
+    _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MASK_VERTEX_COLOR _LAYER_MASK_VERTEX_COLOR_MUL
+    _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
   m_CustomRenderQueue: -1
   stringTagMap: {}
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 1
+    - _HeightAmplitude3: 1
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0
+    - _HeightCenter3: 0
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _InheritBaseLayer1: 0
+    - _InheritBaseLayer2: 0
+    - _InheritBaseLayer3: 0
     - _LayerCount: 2
     - _LayerMaskVertexColor: 1
     - _Metallic: 0
     - _Metallic3: 0
     - _Mode: 0
     - _NormalMapSpace: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
     - _UVSec: 0
+    - _UseHeightBasedBlend: 0
+    - _VertexColorHeightFactor: 0.3
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer0_UV1.mat

   m_Name: Layered_Layer0_UV1
   m_Shader: {fileID: 4800000, guid: 81d02e8644315b742b154842a3a2f98c, type: 3}
   m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
-    _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
+    _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MASK_VERTEX_COLOR _LAYER_MASK_VERTEX_COLOR_MUL
+    _NORMALMAP_TANGENT_SPACE
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - DistortionVectors
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 1
+    - _HeightAmplitude3: 1
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0
+    - _HeightCenter3: 0
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _InheritBaseLayer1: 0
+    - _InheritBaseLayer2: 0
+    - _InheritBaseLayer3: 0
     - _LayerCount: 2
     - _LayerMaskVertexColor: 1
     - _Metallic: 0
     - _Metallic3: 0
     - _Mode: 0
     - _NormalMapSpace: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
     - _UVSec: 0
+    - _UseHeightBasedBlend: 0
+    - _VertexColorHeightFactor: 0.3
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer0_UV2.mat

   m_Name: Layered_Layer0_UV2
   m_Shader: {fileID: 4800000, guid: 81d02e8644315b742b154842a3a2f98c, type: 3}
   m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
-    _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
-    _REQUIRE_UV2_OR_UV3 _REQUIRE_UV3
+    _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MASK_VERTEX_COLOR _LAYER_MASK_VERTEX_COLOR_MUL
+    _NORMALMAP_TANGENT_SPACE _REQUIRE_UV2_OR_UV3 _REQUIRE_UV3
   m_LightmapFlags: 1
   m_CustomRenderQueue: -1
   stringTagMap: {}
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 1
+    - _HeightAmplitude3: 1
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0
+    - _HeightCenter3: 0
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _InheritBaseLayer1: 0
+    - _InheritBaseLayer2: 0
+    - _InheritBaseLayer3: 0
     - _LayerCount: 2
     - _LayerMaskVertexColor: 1
     - _Metallic: 0
     - _Metallic3: 0
     - _Mode: 0
     - _NormalMapSpace: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
     - _UVSec: 0
+    - _UseHeightBasedBlend: 0
+    - _VertexColorHeightFactor: 0.3
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer0_UV3.mat

   m_Name: Layered_Layer0_UV3
   m_Shader: {fileID: 4800000, guid: 81d02e8644315b742b154842a3a2f98c, type: 3}
   m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
-    _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
-    _REQUIRE_UV2_OR_UV3 _REQUIRE_UV3
+    _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MASK_VERTEX_COLOR _LAYER_MASK_VERTEX_COLOR_MUL
+    _NORMALMAP_TANGENT_SPACE _REQUIRE_UV2_OR_UV3 _REQUIRE_UV3
   m_LightmapFlags: 1
   m_CustomRenderQueue: -1
   stringTagMap: {}
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 1
+    - _HeightAmplitude3: 1
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0
+    - _HeightCenter3: 0
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _InheritBaseLayer1: 0
+    - _InheritBaseLayer2: 0
+    - _InheritBaseLayer3: 0
     - _LayerCount: 2
     - _LayerMaskVertexColor: 1
     - _Metallic: 0
     - _Metallic3: 0
     - _Mode: 0
     - _NormalMapSpace: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
     - _UVSec: 0
+    - _UseHeightBasedBlend: 0
+    - _VertexColorHeightFactor: 0.3
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Lit_Ground_01_2x2.mat

     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
-    - _HeightBias: -0.03
+    - _HeightAmplitude: 0.15
+    - _HeightBias: -0.01
+    - _HeightCenter: 0.5
-    - _HeightScale: 0.06
+    - _HeightScale: 0.02
+    - _NormalScale: 1
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _Smoothness: 1

Assets/TestScenes/HDTest/LayeredLitTest/Material/Lit_Moss_02_2x2.mat

     - _GlossMapScale: 0
     - _Glossiness: 0.5
     - _GlossyReflections: 1
+    - _HeightAmplitude: 0.1
+    - _HeightCenter: 0.5
     - _HeightMapMode: 0
     - _HeightScale: 0.05
     - _MaterialId: 0
     - _NormalMapSpace: 0
+    - _NormalScale: 1
     - _OcclusionStrength: 1
     - _Parallax: 0.08
     - _Smoothness: 1

Assets/TestScenes/HDTest/LayeredLitTest/Material/Lit_Sand01_2x2.mat

     - _GlossMapScale: 1
     - _Glossiness: 0
     - _GlossyReflections: 1
+    - _HeightAmplitude: 0.15
+    - _HeightCenter: 0.5
     - _HeightMapMode: 0
     - _HeightScale: 0.1
     - _MaterialId: 0
     - _NormalMapSpace: 0
+    - _NormalScale: 1
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _Smoothness: 1

Assets/TestScenes/HDTest/LayeredLitTest/Material/Lit_Spheres.mat

     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
+    - _HeightAmplitude: 0.25
+    - _HeightCenter: 0.5
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _Metallic3: 0
     - _Mode: 0
     - _NormalMapSpace: 0
+    - _NormalScale: 1
     - _OcclusionStrength: 1
     - _Parallax: 0.02
     - _Smoothness: 0.5

Assets/TestScenes/HDTest/LayeredLitTest/Textures/VolumeTest_01_H.tga.meta

   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
-    sRGBTexture: 1
+    sRGBTexture: 0
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0