Merge pull request #153 from Unity-Technologies/Layered-Lit-Clean-and-update-UI

Layered lit clean and ui update

Assets/ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs

             foreach (Object obj in materials)
             {
                 Material mat = obj as Material;
-                if (mat.shader.name == "HDRenderLoop/LayeredLit")
+                if (mat.shader.name == "HDRenderPipeline/LayeredLit" || mat.shader.name == "HDRenderPipeline/LayeredLitTessellation")
                 {
                     LayeredLitGUI.SynchronizeAllLayers(mat);
                 }

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

 
             public readonly GUIContent materialLayerText = new GUIContent("Material");
             public readonly GUIContent syncButtonText = new GUIContent("Re-Synchronize Layers", "Re-synchronize all layers's properties with the referenced Material");
-            public readonly GUIContent layersText = new GUIContent("Layers");
+            public readonly GUIContent layersText = new GUIContent("Inputs");
-            public readonly GUIContent objectScaleAffectTileText = new GUIContent("Object Scale affect tiling", "Tiling will be affected by the object scale.");
-                        
+            public readonly GUIContent objectScaleAffectTileText = new GUIContent("Tiling 0123 follow object Scale", "Tiling will be affected by the object scale.");
+            public readonly GUIContent objectScaleAffectTileText2 = new GUIContent("Tiling 123 follow object Scale", "Tiling will be affected by the object scale.");
+
-            public readonly GUIContent layerTexWorldScaleText = new GUIContent("Tiling", "Tiling factor applied to Planar/Trilinear mapping");
+            public readonly GUIContent layerTexWorldScaleText = new GUIContent("World Scale", "Tiling factor applied to Planar/Trilinear mapping");
             public readonly GUIContent UVBaseText = new GUIContent("Base UV Mapping", "Base UV Mapping mode of the layer.");
             public readonly GUIContent UVBlendMaskText = new GUIContent("BlendMask UV Mapping", "Base UV Mapping mode of the layer.");
             public readonly GUIContent UVDetailText = new GUIContent("Detail UV Mapping", "Detail UV Mapping mode of the layer.");
 
         override protected void FindMaterialProperties(MaterialProperty[] props)
         {
-            FindMaterialOptionProperties(props);
-
             layerMaskMap = FindProperty(kLayerMaskMap, props);
             layerCount = FindProperty(kLayerCount, props);
             vertexColorMode = FindProperty(kVertexColorMode, props);
             }
         }
 
+        // This function will look for all referenced lit material, and assign value from Lit to layered lit layers.
+        // This is based on the naming of the variables, i.E BaseColor will match BaseColor0, if a properties shouldn't be override
+        // put the name in the exclusionList below
-            string[] exclusionList = { kTexWorldScale, kUVBase, kUVMappingMask, kUVDetail, kUVMappingPlanar, kUVDetailsMappingMask };
+            string[] exclusionList = { kTexWorldScale, kUVBase, kUVMappingMask, kUVMappingPlanar, kUVDetail, kUVDetailsMappingMask };
 
             Material layerMaterial = layers[layerIndex];
 
             }
         }
 
+        // We use the user data to save a string that represent the referenced lit material
+        // so we can keep reference during serialization
         static void InitializeMaterialLayers(AssetImporter materialImporter, ref Material[] layers)
         {
             if (materialImporter.userData != string.Empty)
             materialImporter.userData = JsonUtility.ToJson(layersGUID);
         }
 
-        bool CheckInputOptionConsistency(string optionName, string[] shortNames, ref string outValueNames)
-        {
-            bool result = true;
-            outValueNames = "";
-            for (int i = 0; i < numLayer; ++i)
-            {
-                Material layer = m_MaterialLayers[i];
-                if (layer != null)
-                {
-                    int currentValue = (int)layer.GetFloat(optionName); // All options are in fact enums
-                    Debug.Assert(currentValue < shortNames.Length);
-                    outValueNames += shortNames[currentValue] + "    ";
-
-                    for (int j = i + 1; j < numLayer; ++j)
-                    {
-                        Material otherLayer = m_MaterialLayers[j];
-                        if (otherLayer != null)
-                        {
-                            if (currentValue != (int)otherLayer.GetFloat(optionName))
-                            {
-                                result = false;
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    outValueNames += "X    ";
-                }
-            }
-
-            return result;
-        }
-
-        bool CheckInputFloatOptionConsistency(string optionName, ref string outValueNames)
-        {
-            bool result = true;
-            outValueNames = "";
-            for (int i = 0; i < numLayer; ++i)
-            {
-                Material layer = m_MaterialLayers[i];
-                if (layer != null)
-                {
-                    float currentValue = layer.GetFloat(optionName);
-
-                    for (int j = i + 1; j < numLayer; ++j)
-                    {
-                        Material otherLayer = m_MaterialLayers[j];
-                        if (otherLayer != null)
-                        {
-                            if (currentValue != otherLayer.GetFloat(optionName))
-                            {
-                                result = false;
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    outValueNames += "X    ";
-                }
-            }
-
-            return result;
-        }
-
-        bool CheckInputMapConsistency(string mapName, ref string outValueNames)
-        {
-            bool result = true;
-            outValueNames = "";
-            for (int i = 0; i < numLayer; ++i)
-            {
-                Material layer = m_MaterialLayers[i];
-                if (layer != null)
-                {
-                    bool currentValue = layer.GetTexture(mapName) != null;
-                    outValueNames += (currentValue ? "Y" : "N") + "    ";
-
-                    for (int j = i + 1; j < numLayer; ++j)
-                    {
-                        Material otherLayer = m_MaterialLayers[j];
-                        if (otherLayer != null)
-                        {
-                            bool otherValue = otherLayer.GetTexture(mapName) != null;
-                            if (currentValue != otherValue)
-                            {
-                                result = false;
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    outValueNames += "N    ";
-                }
-            }
-
-            return result;
-        }
-
-        void CheckLayerConsistency()
-        {
-            string optionValueNames = "";
-            // We need to check consistency between all layers.
-            // Each input options and each input maps can result in different #defines in the shader so all of them need to be consistent
-            // otherwise the result will be undetermined
-
-            // Input options consistency
-            string[] smoothnessSourceShortNames = { "Mask", "Albedo" };
-            string[] normalMapShortNames = { "Tan", "Obj" };
-            string[] detailModeShortNames = { "DNormal", "DAOHeight" };
-
-            string warningInputOptions = "";
-            if (!CheckInputOptionConsistency(kSmoothnessTextureChannel, smoothnessSourceShortNames, ref optionValueNames))
-            {
-                warningInputOptions += "Smoothness Source:    " + optionValueNames + "\n";
-            }
-            if (!CheckInputOptionConsistency(kNormalMapSpace, normalMapShortNames, ref optionValueNames))
-            {
-                warningInputOptions += "Normal Map Space:    " + optionValueNames + "\n";
-            }
-            if (!CheckInputOptionConsistency(kDetailMapMode, detailModeShortNames, ref optionValueNames))
-            {
-                warningInputOptions += "Detail Map Mode:    " + optionValueNames + "\n";
-            }
-
-            if (warningInputOptions != string.Empty)
-            {
-                warningInputOptions = "Input Option Consistency Error:\n" + warningInputOptions;
-            }
-
-            // Check input maps consistency
-            string warningInputMaps = "";
-
-            if (!CheckInputMapConsistency(kNormalMap, ref optionValueNames))
-            {
-                warningInputMaps += "Normal Map:    " + optionValueNames + "\n";
-            }
-            if (!CheckInputMapConsistency(kDetailMap, ref optionValueNames))
-            {
-                warningInputMaps += "Detail Map:    " + optionValueNames + "\n";
-            }
-            if (!CheckInputMapConsistency(kMaskMap, ref optionValueNames))
-            {
-                warningInputMaps += "Mask Map:    " + optionValueNames + "\n";
-            }
-            if (!CheckInputMapConsistency(kSpecularOcclusionMap, ref optionValueNames))
-            {
-                warningInputMaps += "Specular Occlusion Map:    " + optionValueNames + "\n";
-            }
-
-            if (warningInputMaps != string.Empty)
-            {
-                warningInputMaps = "Input Maps Consistency Error:\n" + warningInputMaps;
-                if (warningInputOptions != string.Empty)
-                    warningInputMaps = "\n" + warningInputMaps;
-            }
-
-            string warning = warningInputOptions + warningInputMaps;
-            if (warning != string.Empty)
-            {
-                EditorGUILayout.HelpBox(warning, MessageType.Error);
-            }
-        }
-
-        void SynchronizeInputOptions()
-        {
-            Material material = m_MaterialEditor.target as Material;
-
-            // We synchronize input options with the firsts non null Layer (all layers should have consistent options)
-            Material firstLayer = null;
-            int i = 0;
-            while (i < numLayer && !(firstLayer = m_MaterialLayers[i])) ++i;
-
-            if (firstLayer != null)
-            {
-                material.SetFloat(kSmoothnessTextureChannel, firstLayer.GetFloat(kSmoothnessTextureChannel));
-                material.SetFloat(kNormalMapSpace, firstLayer.GetFloat(kNormalMapSpace));
-                // Force emissive to be emissive color
-                material.SetFloat(kEmissiveColorMode, (float)EmissiveColorMode.UseEmissiveColor);
-            }
-        }
-
         bool DoLayerGUI(AssetImporter materialImporter, int layerIndex)
         {
             bool result = false;
                 EditorGUI.indentLevel++;
                 m_MaterialEditor.ShaderProperty(layerTexWorldScale[layerIndex], styles.layerTexWorldScaleText);
                 EditorGUI.indentLevel--;
+
+                if (((LayerUVBaseMapping)layerUVBase[layerIndex].floatValue == LayerUVBaseMapping.Planar))
+                    GUILayout.Label("       " + styles.UVDetailText.text + ": Planar");
+                else
+                    GUILayout.Label("       " + styles.UVDetailText.text + ": Triplanar");
             }
             else
             {
                 EditorGUI.indentLevel--;
             }
 
-            EditorGUILayout.LabelField(styles.heightControlText, EditorStyles.boldLabel);
+            // Display height control if they have a meaning
+            if ( (tessellationMode != null && ((TessellationMode)tessellationMode.floatValue == TessellationMode.Displacement || (TessellationMode)tessellationMode.floatValue == TessellationMode.DisplacementPhong))
+                || (enablePerPixelDisplacement.floatValue > 0.0f)
+                || (useHeightBasedBlend.floatValue > 0.0f)
+                )
+            {
+                EditorGUILayout.LabelField(styles.heightControlText, EditorStyles.boldLabel);
-            EditorGUI.indentLevel++;
-            m_MaterialEditor.ShaderProperty(heightFactor[layerIndex], styles.heightFactorText);
-            layerHeightAmplitude[layerIndex].floatValue = material.GetFloat(kHeightAmplitude + layerIndex) * heightFactor[layerIndex].floatValue;
-            m_MaterialEditor.ShaderProperty(heightCenterOffset[layerIndex], styles.heightCenterOffsetText);
-            layerCenterOffset[layerIndex].floatValue = material.GetFloat(kHeightCenter + layerIndex) + heightCenterOffset[layerIndex].floatValue;
+                EditorGUI.indentLevel++;
+                m_MaterialEditor.ShaderProperty(heightFactor[layerIndex], styles.heightFactorText);
+                layerHeightAmplitude[layerIndex].floatValue = material.GetFloat(kHeightAmplitude + layerIndex) * heightFactor[layerIndex].floatValue;
+                m_MaterialEditor.ShaderProperty(heightCenterOffset[layerIndex], styles.heightCenterOffsetText);
+                layerCenterOffset[layerIndex].floatValue = material.GetFloat(kHeightCenter + layerIndex) + heightCenterOffset[layerIndex].floatValue;
+                EditorGUI.indentLevel--;
+            }            
-            EditorGUI.indentLevel--;
 
             // influence
             if (layerIndex > 0)
-                bool heightBasedBlendEnable = useHeightBasedBlend.floatValue != 0.0f; 
+                bool heightBasedBlendEnable = useHeightBasedBlend.floatValue > 0.0f; 
                 if (heightBasedBlendEnable)
                 {
                     EditorGUI.indentLevel++;
             }
 
             m_MaterialEditor.TexturePropertySingleLine(styles.layerMapMaskText, layerMaskMap);
+
+            EditorGUI.indentLevel++;
-                EditorGUI.indentLevel++;
-                EditorGUI.indentLevel--;
-                EditorGUI.indentLevel++;
-                EditorGUI.indentLevel--;
+            EditorGUI.indentLevel--;
+
+            m_MaterialEditor.ShaderProperty(vertexColorMode, styles.vertexColorModeText);
 
             EditorGUI.BeginChangeCheck();
             EditorGUI.showMixedValue = useMainLayerInfluence.hasMixedValue;
                 useMainLayerInfluence.floatValue = mainLayerModeInfluenceEnable ? 1.0f : 0.0f;
-            }
-
-            m_MaterialEditor.ShaderProperty(vertexColorMode, styles.vertexColorModeText);
+            }            
 
             EditorGUI.BeginChangeCheck();
             EditorGUI.showMixedValue = useDensityMode.hasMixedValue;
                 useHeightBasedBlend.floatValue = enabled ? 1.0f : 0.0f;
             }
 
-            m_MaterialEditor.ShaderProperty(objectScaleAffectTile, styles.objectScaleAffectTileText);            
+            m_MaterialEditor.ShaderProperty(objectScaleAffectTile, mainLayerModeInfluenceEnable ? styles.objectScaleAffectTileText2 : styles.objectScaleAffectTileText);            
 
             EditorGUILayout.Space();
 
         protected override void SetupMaterialKeywords(Material material)
         {
             SetupCommonOptionsKeywords(material);
-            SetupLayersKeywords(material);
+            SetupLayersMappingKeywords(material);
+
+            for (int i = 0; i < kMaxLayerCount; ++i)
+            {
+                SetKeyword(material, "_NORMALMAP_TANGENT_SPACE" + i, ((NormalMapSpace)material.GetFloat(kNormalMapSpace + i)) == NormalMapSpace.TangentSpace);
-            // Find first non null layer
-            int i = 0;
-            while (i < numLayer && (m_MaterialLayers[i] == null)) ++i;
+                SetKeyword(material, "_NORMALMAP" + i, material.GetTexture(kNormalMap + i));
-            if (i < numLayer)
-            {
-                SetKeyword(material, "_NORMALMAP", material.GetTexture(kNormalMap + i));
-                SetKeyword(material, "_MASKMAP", material.GetTexture(kMaskMap + i));
-                SetKeyword(material, "_SPECULAROCCLUSIONMAP", material.GetTexture(kSpecularOcclusionMap + i));
-                SetKeyword(material, "_DETAIL_MAP", material.GetTexture(kDetailMap + i));
+                SetKeyword(material, "_MASKMAP" + i, material.GetTexture(kMaskMap + i));
+
+                SetKeyword(material, "_SPECULAROCCLUSIONMAP" + i, material.GetTexture(kSpecularOcclusionMap + i));
+
+                SetKeyword(material, "_DETAIL_MAP" + i, material.GetTexture(kDetailMap + i));
-                SetKeyword(material, "_DETAIL_MAP_WITH_NORMAL", ((DetailMapMode)material.GetFloat(kDetailMapMode)) == DetailMapMode.DetailWithNormal);
-                SetKeyword(material, "_NORMALMAP_TANGENT_SPACE", ((NormalMapSpace)material.GetFloat(kNormalMapSpace)) == NormalMapSpace.TangentSpace);
-                SetKeyword(material, "_SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A", ((SmoothnessMapChannel)material.GetFloat(kSmoothnessTextureChannel)) == SmoothnessMapChannel.AlbedoAlpha);
+                SetKeyword(material, "_HEIGHTMAP0" + i, material.GetTexture(kHeightMap + i));
-            SetKeyword(material, "_HEIGHTMAP0", material.GetTexture(kHeightMap + 0));
-            SetKeyword(material, "_HEIGHTMAP1", material.GetTexture(kHeightMap + 1));
-            SetKeyword(material, "_HEIGHTMAP2", material.GetTexture(kHeightMap + 2));
-            SetKeyword(material, "_HEIGHTMAP3", material.GetTexture(kHeightMap + 3));
-
             bool perPixelDisplacement = material.GetFloat(kEnablePerPixelDisplacement) == 1.0;
             SetKeyword(material, "_PER_PIXEL_DISPLACEMENT", perPixelDisplacement);
 
 
             bool useDensityModeEnable = material.GetFloat(kUseDensityMode) != 0.0f;
             SetKeyword(material, "_DENSITY_MODE", useDensityModeEnable);
-            
-
-            // We have to check for each layer if the UV2 or UV3 is needed.
-            bool needUV3 = false;
-            bool needUV2 = false;
-            for (int layer = 0; layer < numLayer; ++layer)
-            {
-                string uvBase = string.Format("{0}{1}", kUVBase, layer);
-                string uvDetail = string.Format("{0}{1}", kUVDetail, layer);
-
-                if (    ((UVDetailMapping)material.GetFloat(uvDetail) == UVDetailMapping.UV2) ||
-                        ((LayerUVBaseMapping)material.GetFloat(uvBase) == LayerUVBaseMapping.UV2) )
-                {
-                    needUV2 = true;
-                }
-
-                if (    ((UVDetailMapping)material.GetFloat(uvDetail) == UVDetailMapping.UV3) ||
-                        ((LayerUVBaseMapping)material.GetFloat(uvBase) == LayerUVBaseMapping.UV3) )
-                {
-                    needUV3 = true;
-                    break; // If we find it UV3 let's early out
-                }
-            }
-
-            if (needUV3)
-            {
-                material.DisableKeyword("_REQUIRE_UV2");
-                material.EnableKeyword("_REQUIRE_UV3");
-            }
-            else if (needUV2)
-            {
-                material.EnableKeyword("_REQUIRE_UV2");
-                material.DisableKeyword("_REQUIRE_UV3");
-            }
-            else
-            {
-                material.DisableKeyword("_REQUIRE_UV2");
-                material.DisableKeyword("_REQUIRE_UV3");
-            }
-        void SetupLayersKeywords(Material material)
+        void SetupLayersMappingKeywords(Material material)
         {
             // object scale affect tile
             SetKeyword(material, "_LAYER_TILING_UNIFORM_SCALE", material.GetFloat(kObjectScaleAffectTile) > 0.0f);
                 SetKeyword(material, "_LAYEREDLIT_3_LAYERS", false);
             }
 
-            const string kLayerMappingTriplanar = "_LAYER_MAPPING_TRIPLANAR_";
+            const string kLayerMappingTriplanar = "_LAYER_MAPPING_TRIPLANAR";
+
+            // We have to check for each layer if the UV2 or UV3 is needed.
+            bool needUV3 = false;
+            bool needUV2 = false;
 
             for (int i = 0 ; i < numLayer; ++i)
             {
                 Z = (layerUVDetailMapping == UVDetailMapping.UV2) ? 1.0f : 0.0f;
                 W = (layerUVDetailMapping == UVDetailMapping.UV3) ? 1.0f : 0.0f;
                 layerUVDetailsMappingMask[i].colorValue = new Color(X, Y, Z, W);
+
+                string uvBase = string.Format("{0}{1}", kUVBase, i);
+                string uvDetail = string.Format("{0}{1}", kUVDetail, i);
+
+                if (((UVDetailMapping)material.GetFloat(uvDetail) == UVDetailMapping.UV2) ||
+                    ((LayerUVBaseMapping)material.GetFloat(uvBase) == LayerUVBaseMapping.UV2))
+                {
+                    needUV2 = true;
+                }
+
+                if (((UVDetailMapping)material.GetFloat(uvDetail) == UVDetailMapping.UV3) ||
+                    ((LayerUVBaseMapping)material.GetFloat(uvBase) == LayerUVBaseMapping.UV3))
+                {
+                    needUV3 = true;
+                    break; // If we find it UV3 let's early out
+                }
+            }
+
+            if (needUV3)
+            {
+                material.DisableKeyword("_REQUIRE_UV2");
+                material.EnableKeyword("_REQUIRE_UV3");
+            }
+            else if (needUV2)
+            {
+                material.EnableKeyword("_REQUIRE_UV2");
+                material.DisableKeyword("_REQUIRE_UV3");
+            }
+            else
+            {
+                material.DisableKeyword("_REQUIRE_UV2");
+                material.DisableKeyword("_REQUIRE_UV3");
             }
         }
 
             m_MaterialEditor.TexturePropertySingleLine(Styles.emissiveText, layerEmissiveColorMap, layerEmissiveColor);
             m_MaterialEditor.ShaderProperty(layerEmissiveIntensity, Styles.emissiveIntensityText);
             m_MaterialEditor.LightmapEmissionProperty(1);
-            m_MaterialEditor.ShaderProperty(horizonFade, Styles.horizonFadeText);
-
-            CheckLayerConsistency();
-                SynchronizeInputOptions();
-
                 foreach (var obj in m_MaterialEditor.targets)
                 {
                     SetupMaterialKeywords((Material)obj);

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader

         // Following set of parameters represent the parameters node inside the MaterialGraph.
         // They are use to fill a SurfaceData. With a MaterialGraph this should not exist.
 
+        // All the following properties are filled by the referenced lit shader.
+
         // Reminder. Color here are in linear but the UI (color picker) do the conversion sRGB to linear
         _BaseColor0("BaseColor0", Color) = (1, 1, 1, 1)
         _BaseColor1("BaseColor1", Color) = (1, 1, 1, 1)
         _DetailSmoothnessScale2("_DetailSmoothnessScale2", Range(-2.0, 2.0)) = 1
         _DetailSmoothnessScale3("_DetailSmoothnessScale3", Range(-2.0, 2.0)) = 1
 
-        _DetailHeightScale0("_DetailHeightScale0", Range(-2.0, 2.0)) = 1
-        _DetailHeightScale1("_DetailHeightScale1", Range(-2.0, 2.0)) = 1
-        _DetailHeightScale2("_DetailHeightScale2", Range(-2.0, 2.0)) = 1
-        _DetailHeightScale3("_DetailHeightScale3", Range(-2.0, 2.0)) = 1
+        [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace0("NormalMap space", Float) = 0
+        [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace1("NormalMap space", Float) = 0
+        [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace2("NormalMap space", Float) = 0
+        [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace3("NormalMap space", Float) = 0
-        _DetailAOScale0("_DetailAOScale0", Range(-2.0, 2.0)) = 1
-        _DetailAOScale1("_DetailAOScale1", Range(-2.0, 2.0)) = 1
-        _DetailAOScale2("_DetailAOScale2", Range(-2.0, 2.0)) = 1
-        _DetailAOScale3("_DetailAOScale3", Range(-2.0, 2.0)) = 1
+        // All the following properties exist only in layered lit material
 
         // Layer blending options
         _LayerMaskMap("LayerMaskMap", 2D) = "white" {}
         _HeightFactor2("_HeightFactor2", Float) = 1
         _HeightFactor3("_HeightFactor3", Float) = 1
 
-        _LayerHeightAmplitude0("_LayerHeightAmplitude0", Float) = 1
-        _LayerHeightAmplitude1("_LayerHeightAmplitude1", Float) = 1
-        _LayerHeightAmplitude2("_LayerHeightAmplitude2", Float) = 1
-        _LayerHeightAmplitude3("_LayerHeightAmplitude3", Float) = 1
+        // Store result of combination of _HeightFactor and _HeightAmplitude0
+        [HideInInspector] _LayerHeightAmplitude0("_LayerHeightAmplitude0", Float) = 1
+        [HideInInspector] _LayerHeightAmplitude1("_LayerHeightAmplitude1", Float) = 1
+        [HideInInspector] _LayerHeightAmplitude2("_LayerHeightAmplitude2", Float) = 1
+        [HideInInspector] _LayerHeightAmplitude3("_LayerHeightAmplitude3", Float) = 1
 
         _HeightCenterOffset0("_HeightCenterOffset0", Float) = 0.0
         _HeightCenterOffset1("_HeightCenterOffset1", Float) = 0.0
-        _LayerCenterOffset0("_LayerCenterOffset0", Float) = 0.0
-        _LayerCenterOffset1("_LayerCenterOffset1", Float) = 0.0
-        _LayerCenterOffset2("_LayerCenterOffset2", Float) = 0.0
-        _LayerCenterOffset3("_LayerCenterOffset3", Float) = 0.0
+        // Store result of combination of _HeightCenterOffset0 and _HeightCenter0
+        [HideInInspector] _LayerCenterOffset0("_LayerCenterOffset0", Float) = 0.0
+        [HideInInspector] _LayerCenterOffset1("_LayerCenterOffset1", Float) = 0.0
+        [HideInInspector] _LayerCenterOffset2("_LayerCenterOffset2", Float) = 0.0
+        [HideInInspector] _LayerCenterOffset3("_LayerCenterOffset3", Float) = 0.0
 
         _BlendUsingHeight1("_BlendUsingHeight1", Float) = 0.0
         _BlendUsingHeight2("_BlendUsingHeight2", Float) = 0.0
         _LayerTiling2("_LayerTiling2", Float) = 1
         _LayerTiling3("_LayerTiling3", Float) = 1
 
+        [HideInInspector] _LayerCount("_LayerCount", Float) = 2.0
+
+        [Enum(None, 0, Multiply, 1, Add, 2)] _VertexColorMode("Vertex color mode", Float) = 0
+        
+        [ToggleOff]  _ObjectScaleAffectTile("_ObjectScaleAffectTile", Float) = 0.0
+        [Enum(UV0, 0, Planar, 4, Triplanar, 5)] _UVBlendMask("UV Set for blendMask", Float) = 0
+        [HideInInspector] _UVMappingPlanarBlendMask("_UVMappingPlanarBlendMask", Float) = 0.0
+        _TexWorldScaleBlendMask("Tiling", Float) = 1.0
+
+        // Following are builtin properties
+
         _DistortionVectorMap("DistortionVectorMap", 2D) = "black" {}
 
         _EmissiveColor("EmissiveColor", Color) = (0, 0, 0)
 
         [Enum(None, 0, DoubleSided, 1, DoubleSidedLigthingFlip, 2, DoubleSidedLigthingMirror, 3)] _DoubleSidedMode("Double sided mode", Float) = 0
 
-        [Enum(Mask Alpha, 0, BaseColor Alpha, 1)] _SmoothnessTextureChannel("Smoothness texture channel", Float) = 1
-        [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace("NormalMap space", Float) = 0
-        [Enum(DetailMapNormal, 0, DetailMapAOHeight, 1)] _DetailMapMode("DetailMap mode", Float) = 0
-        [HideInInspector] _LayerCount("_LayerCount", Float) = 2.0
-
-        [Enum(None, 0, Multiply, 1, Add, 2)] _VertexColorMode("Vertex color mode", Float) = 0
-        
-        [ToggleOff]  _ObjectScaleAffectTile("_ObjectScaleAffectTile", Float) = 0.0
-        [Enum(UV0, 0, Planar, 4, Triplanar, 5)] _UVBlendMask("UV Set for blendMask", Float) = 0
-        [HideInInspector] _UVMappingPlanarBlendMask("_UVMappingPlanarBlendMask", Float) = 0.0
-        _TexWorldScaleBlendMask("Tiling", Float) = 1.0
-
         // WARNING
         // All the following properties that concern the UV mapping are the same as in the Lit shader.
         // This means that they will get overridden when synchronizing the various layers.
     #pragma shader_feature _DEPTHOFFSET_ON
     #pragma shader_feature _ _DOUBLESIDED _DOUBLESIDED_LIGHTING_FLIP _DOUBLESIDED_LIGHTING_MIRROR
 
-    #pragma shader_feature _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
-    #pragma shader_feature _LAYER_MAPPING_TRIPLANAR_0
-    #pragma shader_feature _LAYER_MAPPING_TRIPLANAR_1
-    #pragma shader_feature _LAYER_MAPPING_TRIPLANAR_2
-    #pragma shader_feature _LAYER_MAPPING_TRIPLANAR_3
-    #pragma shader_feature _DETAIL_MAP_WITH_NORMAL
-    #pragma shader_feature _NORMALMAP_TANGENT_SPACE   
+    #pragma shader_feature _LAYER_MAPPING_TRIPLANAR0
+    #pragma shader_feature _LAYER_MAPPING_TRIPLANAR1
+    #pragma shader_feature _LAYER_MAPPING_TRIPLANAR2
+    #pragma shader_feature _LAYER_MAPPING_TRIPLANAR3
+    #pragma shader_feature _NORMALMAP_TANGENT_SPACE0
+    #pragma shader_feature _NORMALMAP_TANGENT_SPACE1
+    #pragma shader_feature _NORMALMAP_TANGENT_SPACE2
+    #pragma shader_feature _NORMALMAP_TANGENT_SPACE3
-    #pragma shader_feature _NORMALMAP
-    #pragma shader_feature _MASKMAP
-    #pragma shader_feature _SPECULAROCCLUSIONMAP
+    #pragma shader_feature _NORMALMAP0
+    #pragma shader_feature _NORMALMAP1
+    #pragma shader_feature _NORMALMAP2
+    #pragma shader_feature _NORMALMAP3
+    #pragma shader_feature _MASKMAP0
+    #pragma shader_feature _MASKMAP1
+    #pragma shader_feature _MASKMAP2
+    #pragma shader_feature _MASKMAP3
+    #pragma shader_feature _SPECULAROCCLUSIONMAP0
+    #pragma shader_feature _SPECULAROCCLUSIONMAP1
+    #pragma shader_feature _SPECULAROCCLUSIONMAP2
+    #pragma shader_feature _SPECULAROCCLUSIONMAP3
-    #pragma shader_feature _DETAIL_MAP
+    #pragma shader_feature _DETAIL_MAP0
+    #pragma shader_feature _DETAIL_MAP1
+    #pragma shader_feature _DETAIL_MAP2
+    #pragma shader_feature _DETAIL_MAP3
     #pragma shader_feature _ _LAYER_MASK_VERTEX_COLOR_MUL _LAYER_MASK_VERTEX_COLOR_ADD
     #pragma shader_feature _MAIN_LAYER_INFLUENCE_MODE
     #pragma shader_feature _DENSITY_MODE
         }
     }
 
-	CustomEditor "Experimental.Rendering.HDPipeline.LayeredLitGUI"
+    CustomEditor "Experimental.Rendering.HDPipeline.LayeredLitGUI"
 }

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/LayeredLitTessellation.shader

-Shader "HDRenderPipeline/LayeredLitTesselation"
+Shader "HDRenderPipeline/LayeredLitTessellation"
+
+        // All the following properties are filled by the referenced lit shader.
 
         // Reminder. Color here are in linear but the UI (color picker) do the conversion sRGB to linear
         _BaseColor0("BaseColor0", Color) = (1, 1, 1, 1)
         _DetailSmoothnessScale2("_DetailSmoothnessScale2", Range(-2.0, 2.0)) = 1
         _DetailSmoothnessScale3("_DetailSmoothnessScale3", Range(-2.0, 2.0)) = 1
 
-        _DetailHeightScale0("_DetailHeightScale0", Range(-2.0, 2.0)) = 1
-        _DetailHeightScale1("_DetailHeightScale1", Range(-2.0, 2.0)) = 1
-        _DetailHeightScale2("_DetailHeightScale2", Range(-2.0, 2.0)) = 1
-        _DetailHeightScale3("_DetailHeightScale3", Range(-2.0, 2.0)) = 1
+        [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace0("NormalMap space", Float) = 0
+        [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace1("NormalMap space", Float) = 0
+        [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace2("NormalMap space", Float) = 0
+        [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace3("NormalMap space", Float) = 0
-        _DetailAOScale0("_DetailAOScale0", Range(-2.0, 2.0)) = 1
-        _DetailAOScale1("_DetailAOScale1", Range(-2.0, 2.0)) = 1
-        _DetailAOScale2("_DetailAOScale2", Range(-2.0, 2.0)) = 1
-        _DetailAOScale3("_DetailAOScale3", Range(-2.0, 2.0)) = 1
+        // All the following properties exist only in layered lit material
 
         // Layer blending options
         _LayerMaskMap("LayerMaskMap", 2D) = "white" {}
         _HeightFactor2("_HeightFactor2", Float) = 1
         _HeightFactor3("_HeightFactor3", Float) = 1
 
-        _LayerHeightAmplitude0("_LayerHeightAmplitude0", Float) = 1
-        _LayerHeightAmplitude1("_LayerHeightAmplitude1", Float) = 1
-        _LayerHeightAmplitude2("_LayerHeightAmplitude2", Float) = 1
-        _LayerHeightAmplitude3("_LayerHeightAmplitude3", Float) = 1
+        // Store result of combination of _HeightFactor and _HeightAmplitude0
+        [HideInInspector] _LayerHeightAmplitude0("_LayerHeightAmplitude0", Float) = 1
+        [HideInInspector] _LayerHeightAmplitude1("_LayerHeightAmplitude1", Float) = 1
+        [HideInInspector] _LayerHeightAmplitude2("_LayerHeightAmplitude2", Float) = 1
+        [HideInInspector] _LayerHeightAmplitude3("_LayerHeightAmplitude3", Float) = 1
 
         _HeightCenterOffset0("_HeightCenterOffset0", Float) = 0.0
         _HeightCenterOffset1("_HeightCenterOffset1", Float) = 0.0
-        _LayerCenterOffset0("_LayerCenterOffset0", Float) = 0.0
-        _LayerCenterOffset1("_LayerCenterOffset1", Float) = 0.0
-        _LayerCenterOffset2("_LayerCenterOffset2", Float) = 0.0
-        _LayerCenterOffset3("_LayerCenterOffset3", Float) = 0.0
+        // Store result of combination of _HeightCenterOffset0 and _HeightCenter0
+        [HideInInspector] _LayerCenterOffset0("_LayerCenterOffset0", Float) = 0.0
+        [HideInInspector] _LayerCenterOffset1("_LayerCenterOffset1", Float) = 0.0
+        [HideInInspector] _LayerCenterOffset2("_LayerCenterOffset2", Float) = 0.0
+        [HideInInspector] _LayerCenterOffset3("_LayerCenterOffset3", Float) = 0.0
 
         _BlendUsingHeight1("_BlendUsingHeight1", Float) = 0.0
         _BlendUsingHeight2("_BlendUsingHeight2", Float) = 0.0
         _LayerTiling2("_LayerTiling2", Float) = 1
         _LayerTiling3("_LayerTiling3", Float) = 1
 
+        [HideInInspector] _LayerCount("_LayerCount", Float) = 2.0
+
+        [Enum(None, 0, Multiply, 1, Add, 2)] _VertexColorMode("Vertex color mode", Float) = 0
+        
+        [ToggleOff]  _ObjectScaleAffectTile("_ObjectScaleAffectTile", Float) = 0.0
+        [Enum(UV0, 0, Planar, 4, Triplanar, 5)] _UVBlendMask("UV Set for blendMask", Float) = 0
+        [HideInInspector] _UVMappingPlanarBlendMask("_UVMappingPlanarBlendMask", Float) = 0.0
+        _TexWorldScaleBlendMask("Tiling", Float) = 1.0
+
+        // Following are builtin properties
+
         _DistortionVectorMap("DistortionVectorMap", 2D) = "black" {}
 
         _EmissiveColor("EmissiveColor", Color) = (0, 0, 0)
 
         [Enum(None, 0, DoubleSided, 1, DoubleSidedLigthingFlip, 2, DoubleSidedLigthingMirror, 3)] _DoubleSidedMode("Double sided mode", Float) = 0
 
-        [Enum(Mask Alpha, 0, BaseColor Alpha, 1)] _SmoothnessTextureChannel("Smoothness texture channel", Float) = 1
-        [Enum(TangentSpace, 0, ObjectSpace, 1)] _NormalMapSpace("NormalMap space", Float) = 0
-        [Enum(DetailMapNormal, 0, DetailMapAOHeight, 1)] _DetailMapMode("DetailMap mode", Float) = 0
-
-        [HideInInspector] _LayerCount("_LayerCount", Float) = 2.0
-
-        [Enum(None, 0, Multiply, 1, Add, 2)] _VertexColorMode("Vertex color mode", Float) = 0
-
-        [ToggleOff]  _ObjectScaleAffectTile("_ObjectScaleAffectTile", Float) = 0.0
-        [Enum(UV0, 0, Planar, 4, Triplanar, 5)] _UVBlendMask("UV Set for blendMask", Float) = 0
-        [HideInInspector] _UVMappingPlanarBlendMask("_UVMappingPlanarBlendMask", Float) = 0.0
-        _TexWorldScaleBlendMask("Tiling", Float) = 1.0
 
         // WARNING
         // All the following properties that concern the UV mapping are the same as in the Lit shader.
     #pragma shader_feature _ _TESSELLATION_DISPLACEMENT _TESSELLATION_DISPLACEMENT_PHONG
     #pragma shader_feature _TESSELLATION_OBJECT_SCALE
 
-    #pragma shader_feature _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
-    #pragma shader_feature _LAYER_MAPPING_TRIPLANAR_0
-    #pragma shader_feature _LAYER_MAPPING_TRIPLANAR_1
-    #pragma shader_feature _LAYER_MAPPING_TRIPLANAR_2
-    #pragma shader_feature _LAYER_MAPPING_TRIPLANAR_3
-    #pragma shader_feature _DETAIL_MAP_WITH_NORMAL
-    #pragma shader_feature _NORMALMAP_TANGENT_SPACE   
+    #pragma shader_feature _LAYER_MAPPING_TRIPLANAR0
+    #pragma shader_feature _LAYER_MAPPING_TRIPLANAR1
+    #pragma shader_feature _LAYER_MAPPING_TRIPLANAR2
+    #pragma shader_feature _LAYER_MAPPING_TRIPLANAR3
+    #pragma shader_feature _NORMALMAP_TANGENT_SPACE0
+    #pragma shader_feature _NORMALMAP_TANGENT_SPACE1
+    #pragma shader_feature _NORMALMAP_TANGENT_SPACE2
+    #pragma shader_feature _NORMALMAP_TANGENT_SPACE3
-    #pragma shader_feature _NORMALMAP
-    #pragma shader_feature _MASKMAP
-    #pragma shader_feature _SPECULAROCCLUSIONMAP
+    #pragma shader_feature _NORMALMAP0
+    #pragma shader_feature _NORMALMAP1
+    #pragma shader_feature _NORMALMAP2
+    #pragma shader_feature _NORMALMAP3
+    #pragma shader_feature _MASKMAP0
+    #pragma shader_feature _MASKMAP1
+    #pragma shader_feature _MASKMAP2
+    #pragma shader_feature _MASKMAP3
+    #pragma shader_feature _SPECULAROCCLUSIONMAP0
+    #pragma shader_feature _SPECULAROCCLUSIONMAP1
+    #pragma shader_feature _SPECULAROCCLUSIONMAP2
+    #pragma shader_feature _SPECULAROCCLUSIONMAP3
-    #pragma shader_feature _DETAIL_MAP
+    #pragma shader_feature _DETAIL_MAP0
+    #pragma shader_feature _DETAIL_MAP1
+    #pragma shader_feature _DETAIL_MAP2
+    #pragma shader_feature _DETAIL_MAP3
     #pragma shader_feature _ _LAYER_MASK_VERTEX_COLOR_MUL _LAYER_MASK_VERTEX_COLOR_ADD
     #pragma shader_feature _MAIN_LAYER_INFLUENCE_MODE
     #pragma shader_feature _DENSITY_MODE
             #include "../../Lighting/Forward.hlsl"
             #include "HDRenderPipeline/Debug/HDRenderPipelineDebug.cs.hlsl"
             #include "HDRenderPipeline/Debug/DebugLighting.hlsl"
-            
             // TEMP until pragma work in include
             #pragma multi_compile LIGHTLOOP_SINGLE_PASS LIGHTLOOP_TILE_PASS
 

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Editor/BaseLitUI.cs

     {
         protected static class Styles
         {
-            public static string optionText = "Options";
+            public static string optionText = "Surface options";
             public static string surfaceTypeText = "Surface Type";
             public static string blendModeText = "Blend Mode";
             public static string detailText = "Inputs Detail";
             public static GUIContent distortionEnableText = new GUIContent("Distortion", "Enable distortion on this shader");
             public static GUIContent distortionOnlyText = new GUIContent("Distortion Only", "This shader will only be use to render distortion");
             public static GUIContent distortionDepthTestText = new GUIContent("Distortion Depth Test", "Enable the depth test for distortion");
-            public static GUIContent depthOffsetEnableText = new GUIContent("DepthOffset", "EnableDepthOffset on this shader (Use with heightmap)");
-            public static GUIContent horizonFadeText = new GUIContent("HorizonFade", "horizon fade is use to control specular occlusion");            
+            public static GUIContent depthOffsetEnableText = new GUIContent("Enable Depth Offset", "EnableDepthOffset on this shader (Use with heightmap)");
+            public static GUIContent horizonFadeText = new GUIContent("Horizon Fade (Spec occlusion)", "horizon fade is use to control specular occlusion");            
-            public static string InputsOptionsText = "Inputs options";
-
-            public static GUIContent UVBaseMappingText = new GUIContent("UV set for Base", "");
-            public static GUIContent texWorldScaleText = new GUIContent("Tiling", "Tiling factor applied to Planar/Trilinear mapping");
-            public static GUIContent UVBaseDetailMappingText = new GUIContent("UV set for Base and Detail", "");
+            public static GUIContent UVBaseMappingText = new GUIContent("Base UV mapping", "");
+            public static GUIContent texWorldScaleText = new GUIContent("World scale", "Tiling factor applied to Planar/Trilinear mapping");
             public static GUIContent normalMapSpaceText = new GUIContent("Normal/Tangent Map space", "");
             public static GUIContent enablePerPixelDisplacementText = new GUIContent("Enable Per Pixel Displacement", "");
             public static GUIContent ppdMinSamplesText = new GUIContent("Minimum samples", "Minimun samples to use with per pixel displacement mapping");
             public static GUIContent detailMapModeText = new GUIContent("Detail Map with Normal", "Detail Map with AO / Height");
-            public static GUIContent UVDetailMappingText = new GUIContent("UV set for Detail", "");
+            public static GUIContent UVDetailMappingText = new GUIContent("Detail UV mapping", "");
             public static GUIContent emissiveColorModeText = new GUIContent("Emissive Color Usage", "Use emissive color or emissive mask");
 
             public static string InputsText = "Inputs";
             public static GUIContent metallicText = new GUIContent("Metallic", "Metallic scale factor");
             public static GUIContent smoothnessText = new GUIContent("Smoothness", "Smoothness scale factor");
             public static GUIContent maskMapESText = new GUIContent("Mask Map - M(R), AO(G), E(B), S(A)", "Mask map");
-            public static GUIContent maskMapEText = new GUIContent("Mask Map - M(R), AO(G), E(B)", "Mask map");
-            public static GUIContent maskMapText = new GUIContent("Mask Map - M(R), AO(G)", "Mask map");
             public static GUIContent maskMapSText = new GUIContent("Mask Map - M(R), AO(G), S(A)", "Mask map");
 
             public static GUIContent specularOcclusionMapText = new GUIContent("Specular Occlusion Map (RGBA)", "Specular Occlusion Map");
             public static GUIContent anisotropyMapText = new GUIContent("Anisotropy Map (B)", "Anisotropy");
 
             public static GUIContent detailMapNormalText = new GUIContent("Detail Map A(R) Ny(G) S(B) Nx(A)", "Detail Map");
-            public static GUIContent detailMapAOHeightText = new GUIContent("Detail Map  A(R) AO(G) S(B) H(A)", "Detail Map");
             public static GUIContent detailMaskText = new GUIContent("Detail Mask (G)", "Mask for detailMap");
             public static GUIContent detailAlbedoScaleText = new GUIContent("Detail AlbedoScale", "Detail Albedo Scale factor");
             public static GUIContent detailNormalScaleText = new GUIContent("Detail NormalScale", "Normal Scale factor");
                 m_MaterialEditor.ShaderProperty(alphaCutoff, Styles.alphaCutoffText.text);
             }
             m_MaterialEditor.ShaderProperty(doubleSidedMode, Styles.doubleSidedModeText.text);
-            m_MaterialEditor.ShaderProperty(depthOffsetEnable, Styles.depthOffsetEnableText.text);
+
+            m_MaterialEditor.ShaderProperty(enablePerPixelDisplacement, Styles.enablePerPixelDisplacementText);
+            if (enablePerPixelDisplacement.floatValue > 0.0)
+            {
+                EditorGUI.indentLevel++;
+                m_MaterialEditor.ShaderProperty(ppdMinSamples, Styles.ppdMinSamplesText);
+                m_MaterialEditor.ShaderProperty(ppdMaxSamples, Styles.ppdMaxSamplesText);
+                ppdMinSamples.floatValue = Mathf.Min(ppdMinSamples.floatValue, ppdMaxSamples.floatValue);
+                m_MaterialEditor.ShaderProperty(ppdLodThreshold, Styles.ppdLodThresholdText);
+                m_MaterialEditor.ShaderProperty(depthOffsetEnable, Styles.depthOffsetEnableText.text);
+                EditorGUI.indentLevel--;
+            }
+
+            m_MaterialEditor.ShaderProperty(horizonFade, Styles.horizonFadeText);
 
             EditorGUI.indentLevel--;
 
                 m_MaterialEditor.ShaderProperty(tessellationObjectScale, Styles.tessellationObjectScaleText);
                 EditorGUI.indentLevel--;
             }
-
-            GUILayout.Label(Styles.perPixelDisplacementText, EditorStyles.boldLabel);
-            EditorGUI.indentLevel++;
-            m_MaterialEditor.ShaderProperty(enablePerPixelDisplacement, Styles.enablePerPixelDisplacementText);
-            if (enablePerPixelDisplacement.floatValue > 0.0)
-            {
-                EditorGUI.indentLevel++;
-                m_MaterialEditor.ShaderProperty(ppdMinSamples, Styles.ppdMinSamplesText);
-                m_MaterialEditor.ShaderProperty(ppdMaxSamples, Styles.ppdMaxSamplesText);
-                ppdMinSamples.floatValue = Mathf.Min(ppdMinSamples.floatValue, ppdMaxSamples.floatValue);
-                m_MaterialEditor.ShaderProperty(ppdLodThreshold, Styles.ppdLodThresholdText);
-                EditorGUI.indentLevel--;
-            }
-            EditorGUI.indentLevel--;
         }
 
         protected void FindCommonOptionProperties(MaterialProperty[] props)
                 ShaderOptionsGUI();
                 EditorGUILayout.Space();
 
-                ShaderInputOptionsGUI();
-
                 EditorGUILayout.Space();
                 ShaderInputGUI();
             }
 
         protected abstract void FindMaterialProperties(MaterialProperty[] props);
 		protected abstract void ShaderInputGUI();
-        protected abstract void ShaderInputOptionsGUI();
         protected abstract void SetupMaterialKeywords(Material material);
         protected abstract bool ShouldEmissionBeEnabled(Material material);
     }

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Editor/LitUI.cs

 {
     class LitGUI : BaseLitGUI
     {
-        public enum SmoothnessMapChannel
-        {
-            MaskAlpha,
-            AlbedoAlpha,
-        }
-
         public enum UVBaseMapping
         {
             UV0,
             Displacement,
         }
 
-        public enum DetailMapMode
-        {
-            DetailWithNormal,
-            DetailWithAOHeight,
-        }
-
         public enum UVDetailMapping
         {
             UV0,
             SpecularColor = 3
         }
 
-        protected MaterialProperty smoothnessMapChannel = null;
-        protected const string kSmoothnessTextureChannel = "_SmoothnessTextureChannel";
         protected MaterialProperty UVBase = null;
         protected const string kUVBase = "_UVBase";
         protected MaterialProperty TexWorldScale = null;
         protected const string kUVMappingPlanar = "_UVMappingPlanar";      
         protected MaterialProperty normalMapSpace = null;
         protected const string kNormalMapSpace = "_NormalMapSpace";
-        protected MaterialProperty detailMapMode = null;
-        protected const string kDetailMapMode = "_DetailMapMode";
         protected MaterialProperty UVDetail = null;
         protected const string kUVDetail = "_UVDetail";
         protected MaterialProperty UVDetailsMappingMask = null;
         protected const string kDetailNormalScale = "_DetailNormalScale";
         protected MaterialProperty detailSmoothnessScale = null;
         protected const string kDetailSmoothnessScale = "_DetailSmoothnessScale";
-        protected MaterialProperty detailHeightScale = null;
-        protected const string kDetailHeightScale = "_DetailHeightScale";
-        protected MaterialProperty detailAOScale = null;
-        protected const string kDetailAOScale = "_DetailAOScale";
 
         protected MaterialProperty emissiveColor = null;
         protected const string kEmissiveColor = "_EmissiveColor";
         protected MaterialProperty thicknessMap         = null;
         protected const string     kThicknessMap        = "_ThicknessMap";
 
-        // These are options that are shared with the LayeredLit shader. Don't put anything that can't be shared here:
-        // For instance, properties like BaseColor and such don't exist in the LayeredLit so don't put them here.
-        protected void FindMaterialOptionProperties(MaterialProperty[] props)
-        {
-            smoothnessMapChannel = FindProperty(kSmoothnessTextureChannel, props);
-            normalMapSpace = FindProperty(kNormalMapSpace, props);                      
-            detailMapMode = FindProperty(kDetailMapMode, props);
-            emissiveColorMode = FindProperty(kEmissiveColorMode, props);
-        }
-
-            FindMaterialOptionProperties(props);
+            normalMapSpace = FindProperty(kNormalMapSpace, props);
+            emissiveColorMode = FindProperty(kEmissiveColorMode, props);
 
             baseColor = FindProperty(kBaseColor, props);
             baseColorMap = FindProperty(kBaseColorMap, props);
             detailAlbedoScale = FindProperty(kDetailAlbedoScale, props);
             detailNormalScale = FindProperty(kDetailNormalScale, props);
             detailSmoothnessScale = FindProperty(kDetailSmoothnessScale, props);
-            detailHeightScale = FindProperty(kDetailHeightScale, props);
-            detailAOScale = FindProperty(kDetailAOScale, props);
 
             emissiveColor = FindProperty(kEmissiveColor, props);
             emissiveColorMap = FindProperty(kEmissiveColorMap, props);
             thicknessMap        = FindProperty(kThicknessMap,        props);
         }
 
-        override protected void ShaderInputOptionsGUI()
-        {
-            // When Planar or Triplanar is enable the UVDetail use the same mode, so we disable the choice on UVDetail
-            bool enableUVDetail = (UVBaseMapping)UVBase.floatValue == UVBaseMapping.UV0;
-
-            EditorGUI.indentLevel++;
-            GUILayout.Label(Styles.InputsOptionsText, EditorStyles.boldLabel);
-            m_MaterialEditor.ShaderProperty(materialID, Styles.materialIDText);
-
-            m_MaterialEditor.ShaderProperty(smoothnessMapChannel, Styles.smoothnessMapChannelText);
-            m_MaterialEditor.ShaderProperty(UVBase, enableUVDetail ? Styles.UVBaseDetailMappingText : Styles.UVBaseMappingText);
-
-            float X, Y, Z, W;
-            X = ((UVBaseMapping)UVBase.floatValue == UVBaseMapping.UV0) ? 1.0f : 0.0f;
-            UVMappingMask.colorValue = new Color(X, 0.0f, 0.0f, 0.0f);
-            UVMappingPlanar.floatValue = ((UVBaseMapping)UVBase.floatValue == UVBaseMapping.Planar) ? 1.0f : 0.0f;
-            if (((UVBaseMapping)UVBase.floatValue == UVBaseMapping.Planar) || ((UVBaseMapping)UVBase.floatValue == UVBaseMapping.Triplanar))
-            {
-                EditorGUI.indentLevel++;
-                m_MaterialEditor.ShaderProperty(TexWorldScale, Styles.texWorldScaleText);
-                EditorGUI.indentLevel--;
-            }
-            if (enableUVDetail)
-            {
-                m_MaterialEditor.ShaderProperty(UVDetail, Styles.UVDetailMappingText);
-            }
-
-            X = ((UVDetailMapping)UVDetail.floatValue == UVDetailMapping.UV0) ? 1.0f : 0.0f;
-            Y = ((UVDetailMapping)UVDetail.floatValue == UVDetailMapping.UV1) ? 1.0f : 0.0f;
-            Z = ((UVDetailMapping)UVDetail.floatValue == UVDetailMapping.UV2) ? 1.0f : 0.0f;
-            W = ((UVDetailMapping)UVDetail.floatValue == UVDetailMapping.UV3) ? 1.0f : 0.0f;
-            UVDetailsMappingMask.colorValue = new Color(X, Y, Z, W);
-
-            //m_MaterialEditor.ShaderProperty(detailMapMode, Styles.detailMapModeText);
-            m_MaterialEditor.ShaderProperty(normalMapSpace, Styles.normalMapSpaceText);
-            m_MaterialEditor.ShaderProperty(emissiveColorMode, Styles.emissiveColorModeText);            
-
-            EditorGUI.indentLevel--;
-        }
-
         protected void ShaderSSSInputGUI()
         {
             m_MaterialEditor.ShaderProperty(subsurfaceProfile, Styles.subsurfaceProfileText);
         }
 
         override protected void ShaderInputGUI()
-        {
-            EditorGUI.indentLevel++;
-            bool smoothnessInAlbedoAlpha = (SmoothnessMapChannel)smoothnessMapChannel.floatValue == SmoothnessMapChannel.AlbedoAlpha;
-            bool useDetailMapWithNormal = (DetailMapMode)detailMapMode.floatValue == DetailMapMode.DetailWithNormal;
+        {            
-            m_MaterialEditor.TexturePropertySingleLine(smoothnessInAlbedoAlpha ? Styles.baseColorSmoothnessText : Styles.baseColorText, baseColorMap, baseColor);
+
+            EditorGUI.indentLevel++;
+            m_MaterialEditor.ShaderProperty(materialID, Styles.materialIDText);
+
+            m_MaterialEditor.TexturePropertySingleLine(Styles.baseColorText, baseColorMap, baseColor);
-            if (smoothnessInAlbedoAlpha && useEmissiveMask)
-                m_MaterialEditor.TexturePropertySingleLine(Styles.maskMapEText, maskMap);
-            else if (smoothnessInAlbedoAlpha && !useEmissiveMask)
-                m_MaterialEditor.TexturePropertySingleLine(Styles.maskMapText, maskMap);
-            else if (!smoothnessInAlbedoAlpha && useEmissiveMask)
+            if (useEmissiveMask)
-            else if (!smoothnessInAlbedoAlpha && !useEmissiveMask)
+            else
+            m_MaterialEditor.ShaderProperty(normalMapSpace, Styles.normalMapSpaceText);
             m_MaterialEditor.TexturePropertySingleLine(Styles.normalMapText, normalMap, normalScale);
 
             m_MaterialEditor.TexturePropertySingleLine(Styles.heightMapText, heightMap);
             }
 
             EditorGUILayout.Space();
-            GUILayout.Label(Styles.textureControlText, EditorStyles.label);
+            GUILayout.Label("    " + Styles.textureControlText, EditorStyles.label);
+            m_MaterialEditor.ShaderProperty(UVBase, Styles.UVBaseMappingText);
+            // UVSet0 is always set, planar and triplanar will override it.
+            UVMappingMask.colorValue = new Color(1.0f, 0.0f, 0.0f, 0.0f); // This is override in the shader anyway but just in case.
+            UVMappingPlanar.floatValue = ((UVBaseMapping)UVBase.floatValue == UVBaseMapping.Planar) ? 1.0f : 0.0f;
+            if (((UVBaseMapping)UVBase.floatValue == UVBaseMapping.Planar) || ((UVBaseMapping)UVBase.floatValue == UVBaseMapping.Triplanar))
+            {
+                m_MaterialEditor.ShaderProperty(TexWorldScale, Styles.texWorldScaleText);
+            }
-            m_MaterialEditor.TexturePropertySingleLine(Styles.detailMaskText, detailMask);               
-
-            if (useDetailMapWithNormal)
+            m_MaterialEditor.TexturePropertySingleLine(Styles.detailMaskText, detailMask);
+            m_MaterialEditor.TexturePropertySingleLine(Styles.detailMapNormalText, detailMap);
+            
+            EditorGUI.indentLevel++;            
+            // When Planar or Triplanar is enable the UVDetail use the same mode, so we disable the choice on UVDetail
+            if ((UVBaseMapping)UVBase.floatValue == UVBaseMapping.UV0)
-                m_MaterialEditor.TexturePropertySingleLine(Styles.detailMapNormalText, detailMap);
+                m_MaterialEditor.ShaderProperty(UVDetail, Styles.UVDetailMappingText);
-            else
+            else if ((UVBaseMapping)UVBase.floatValue == UVBaseMapping.Planar)
+            {
+                GUILayout.Label("       " + Styles.UVDetailMappingText.text + ": Planar");
+            }
+            else if ((UVBaseMapping)UVBase.floatValue == UVBaseMapping.Triplanar)
-                m_MaterialEditor.TexturePropertySingleLine(Styles.detailMapAOHeightText, detailMap);
+                GUILayout.Label("       " + Styles.UVDetailMappingText.text + ": Triplanar");
+
+            // IF planar/triplanar is not chose, setup the UVSet chosen
+            float X, Y, Z, W;
+            X = ((UVDetailMapping)UVDetail.floatValue == UVDetailMapping.UV0) ? 1.0f : 0.0f;
+            Y = ((UVDetailMapping)UVDetail.floatValue == UVDetailMapping.UV1) ? 1.0f : 0.0f;
+            Z = ((UVDetailMapping)UVDetail.floatValue == UVDetailMapping.UV2) ? 1.0f : 0.0f;
+            W = ((UVDetailMapping)UVDetail.floatValue == UVDetailMapping.UV3) ? 1.0f : 0.0f;
+            UVDetailsMappingMask.colorValue = new Color(X, Y, Z, W);
+
-            EditorGUI.indentLevel++;
-            //m_MaterialEditor.ShaderProperty(detailHeightScale, Styles.detailHeightScaleText);
-            //m_MaterialEditor.ShaderProperty(detailAOScale, Styles.detailAOScaleText);
+            m_MaterialEditor.ShaderProperty(emissiveColorMode, Styles.emissiveColorModeText);
+
-            m_MaterialEditor.LightmapEmissionProperty(MaterialEditor.kMiniTextureFieldLabelIndentLevel + 1);
-            m_MaterialEditor.ShaderProperty(horizonFade, Styles.horizonFadeText);
+            m_MaterialEditor.LightmapEmissionProperty(MaterialEditor.kMiniTextureFieldLabelIndentLevel + 1);            
             EditorGUI.indentLevel--;
 
             EditorGUILayout.Space();
 
             // Note: keywords must be based on Material value not on MaterialProperty due to multi-edit & material animation
             // (MaterialProperty value might come from renderer material property block)
-            SetKeyword(material, "_SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A", ((SmoothnessMapChannel)material.GetFloat(kSmoothnessTextureChannel)) == SmoothnessMapChannel.AlbedoAlpha);
-            SetKeyword(material, "_DETAIL_MAP_WITH_NORMAL", ((DetailMapMode)material.GetFloat(kDetailMapMode)) == DetailMapMode.DetailWithNormal);
             SetKeyword(material, "_EMISSIVE_COLOR", ((EmissiveColorMode)material.GetFloat(kEmissiveColorMode)) == EmissiveColorMode.UseEmissiveColor);
 
 			SetKeyword(material, "_NORMALMAP", material.GetTexture(kNormalMap) || material.GetTexture(kDetailMap)); // With details map, we always use a normal map and Unity provide a default (0, 0, 1) normal map for ir

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader

         _HeightAmplitude("Height Amplitude", Float) = 0.01 // In world units
         _HeightCenter("Height Center", Float) = 0.5 // In texture space
 
-        _TangentMap("TangentMap", 2D) = "bump" {}
-        _Anisotropy("Anisotropy", Range(0.0, 1.0)) = 0
-        _AnisotropyMap("AnisotropyMap", 2D) = "white" {}
-
-        _DetailHeightScale("_DetailHeightScale", Range(-2.0, 2.0)) = 1
-        _DetailAOScale("_DetailAOScale", Range(-2.0, 2.0)) = 1
+
+        _TangentMap("TangentMap", 2D) = "bump" {}
+        _Anisotropy("Anisotropy", Range(0.0, 1.0)) = 0
+        _AnisotropyMap("AnisotropyMap", 2D) = "white" {}
-        _SubsurfaceRadius("Subsurface Radius", Range(0.004, 1.0)) = 0.5
+        _SubsurfaceRadius("Subsurface Radius", Range(0.004, 1.0)) = 1.0
         _SubsurfaceRadiusMap("Subsurface Radius Map", 2D) = "white" {}
         _Thickness("Thickness", Range(0.004, 1.0)) = 0.5
         _ThicknessMap("Thickness Map", 2D) = "white" {}
 
         [Enum(None, 0, DoubleSided, 1, DoubleSidedLigthingFlip, 2, DoubleSidedLigthingMirror, 3)] _DoubleSidedMode("Double sided mode", Float) = 0
 
-        [Enum(Mask Alpha, 0, BaseColor Alpha, 1)] _SmoothnessTextureChannel("Smoothness texture channel", Float) = 1
         [Enum(UV0, 0, Planar, 1, TriPlanar, 2)] _UVBase("UV Set for base", Float) = 0
         _TexWorldScale("Scale to apply on world coordinate", Float) = 1.0
         [HideInInspector] _UVMappingMask("_UVMappingMask", Color) = (1, 0, 0, 0)
         _PPDMinSamples("Min sample for POM", Range(1.0, 64.0)) = 5
         _PPDMaxSamples("Max sample for POM", Range(1.0, 64.0)) = 15
         _PPDLodThreshold("Start lod to fade out the POM effect", Range(0.0, 16.0)) = 5
-        [Enum(DetailMapNormal, 0, DetailMapAOHeight, 1)] _DetailMapMode("DetailMap mode", Float) = 0
         [Enum(UV0, 0, UV1, 1, UV2, 2, UV3, 3)] _UVDetail("UV Set for detail", Float) = 0
         [HideInInspector] _UVDetailsMappingMask("_UVDetailsMappingMask", Color) = (1, 0, 0, 0)
         [Enum(Use Emissive Color, 0, Use Emissive Mask, 1)] _EmissiveColorMode("Emissive color mode", Float) = 1        
     #pragma shader_feature _DEPTHOFFSET_ON
     #pragma shader_feature _ _DOUBLESIDED _DOUBLESIDED_LIGHTING_FLIP _DOUBLESIDED_LIGHTING_MIRROR
 
-    #pragma shader_feature _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
-    #pragma shader_feature _DETAIL_MAP_WITH_NORMAL
     #pragma shader_feature _NORMALMAP_TANGENT_SPACE
     #pragma shader_feature _PER_PIXEL_DISPLACEMENT
     #pragma shader_feature _ _REQUIRE_UV2 _REQUIRE_UV3

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl

 #define LAYER_INDEX 0
 #define ADD_IDX(Name) Name
 #define ADD_ZERO_IDX(Name) Name
+#ifdef _NORMALMAP
+#define _NORMALMAP_IDX
+#endif
+#ifdef _NORMALMAP_TANGENT_SPACE
+#define _NORMALMAP_TANGENT_SPACE_IDX
+#endif
+#ifdef _DETAIL_MAP
+#define _DETAIL_MAP_IDX
+#endif
+#ifdef _MASKMAP
+#define _MASKMAP_IDX
+#endif
+#ifdef _SPECULAROCCLUSIONMAP
+#define _SPECULAROCCLUSIONMAP_IDX
+#endif
 #include "LitDataInternal.hlsl"
 
 void GetLayerTexCoord(float2 texCoord0, float2 texCoord1, float2 texCoord2, float2 texCoord3,
 #endif
 
     // Be sure that the compiler is aware that we don't touch UV1 to UV3 for main layer so it can optimize code
-    _UVMappingMask.yzw = float3(0.0, 0.0, 0.0);
+    // Also we have always UVset to 1, if planar/triplanar is enable, it will override it.
+    _UVMappingMask = float4(1.0, 0.0, 0.0, 0.0);
     ComputeLayerTexCoord(   texCoord0, texCoord1, texCoord2, texCoord3, 
                             positionWS, normalWS,  _UVMappingPlanar > 0.0, isTriplanar, _TexWorldScale, layerTexCoord);
 }
 #if defined(_HEIGHTMAP)
     if (layerTexCoord.base.isTriplanar)
     {
-        minUvSize = min(layerTexCoord.base.uvYZ * _HeightMap_TexelSize.zw, minUvSize);
-        minUvSize = min(layerTexCoord.base.uvZX * _HeightMap_TexelSize.zw, minUvSize);
+        minUvSize = min(layerTexCoord.base.uvZY * _HeightMap_TexelSize.zw, minUvSize);
+        minUvSize = min(layerTexCoord.base.uvXZ * _HeightMap_TexelSize.zw, minUvSize);
         minUvSize = min(layerTexCoord.base.uvXY * _HeightMap_TexelSize.zw, minUvSize);
     }
     else
             // apply the 3 offset on all layers
             /*
 
-            ppdParam.uv = layerTexCoord.base0.uvYZ;
+            ppdParam.uv = layerTexCoord.base0.uvZY;
 
             float3 viewDirTS = ;
             int numSteps = (int)lerp(_PPDMaxSamples, _PPDMinSamples, abs(viewDirTS.z));
 // include LitDataInternal multiple time to define the variation of GetSurfaceData for each layer
 #define LAYER_INDEX 0
 #define ADD_IDX(Name) Name##0
+#ifdef _NORMALMAP0
+#define _NORMALMAP_IDX
+#endif
+#ifdef _NORMALMAP_TANGENT_SPACE0
+#define _NORMALMAP_TANGENT_SPACE_IDX
+#endif
+#ifdef _DETAIL_MAP0
+#define _DETAIL_MAP_IDX
+#endif
+#ifdef _MASKMAP0
+#define _MASKMAP_IDX
+#endif
+#ifdef _SPECULAROCCLUSIONMAP0
+#define _SPECULAROCCLUSIONMAP_IDX
+#endif
+#undef _NORMALMAP_IDX 
+#undef _NORMALMAP_TANGENT_SPACE_IDX 
+#undef _DETAIL_MAP_IDX 
+#undef _MASKMAP_IDX 
+#undef _SPECULAROCCLUSIONMAP_IDX 
+#ifdef _NORMALMAP1
+#define _NORMALMAP_IDX
+#endif
+#ifdef _NORMALMAP_TANGENT_SPACE1
+#define _NORMALMAP_TANGENT_SPACE_IDX
+#endif
+#ifdef _DETAIL_MAP1
+#define _DETAIL_MAP_IDX
+#endif
+#ifdef _MASKMAP1
+#define _MASKMAP_IDX
+#endif
+#ifdef _SPECULAROCCLUSIONMAP1
+#define _SPECULAROCCLUSIONMAP_IDX
+#endif
+#undef _NORMALMAP_IDX 
+#undef _NORMALMAP_TANGENT_SPACE_IDX 
+#undef _DETAIL_MAP_IDX 
+#undef _MASKMAP_IDX 
+#undef _SPECULAROCCLUSIONMAP_IDX 
+#ifdef _NORMALMAP2
+#define _NORMALMAP_IDX
+#endif
+#ifdef _NORMALMAP_TANGENT_SPACE2
+#define _NORMALMAP_TANGENT_SPACE_IDX
+#endif
+#ifdef _DETAIL_MAP2
+#define _DETAIL_MAP_IDX
+#endif
+#ifdef _MASKMAP2
+#define _MASKMAP_IDX
+#endif
+#ifdef _SPECULAROCCLUSIONMAP2
+#define _SPECULAROCCLUSIONMAP_IDX
+#endif
+#undef _NORMALMAP_IDX 
+#undef _NORMALMAP_TANGENT_SPACE_IDX 
+#undef _DETAIL_MAP_IDX 
+#undef _MASKMAP_IDX 
+#undef _SPECULAROCCLUSIONMAP_IDX 
+#ifdef _NORMALMAP3
+#define _NORMALMAP_IDX
+#endif
+#ifdef _NORMALMAP_TANGENT_SPACE3
+#define _NORMALMAP_TANGENT_SPACE_IDX
+#endif
+#ifdef _DETAIL_MAP3
+#define _DETAIL_MAP_IDX
+#endif
+#ifdef _MASKMAP3
+#define _MASKMAP_IDX
+#endif
+#ifdef _SPECULAROCCLUSIONMAP3
+#define _SPECULAROCCLUSIONMAP_IDX
+#endif
+#undef _NORMALMAP_IDX 
+#undef _NORMALMAP_TANGENT_SPACE_IDX 
+#undef _DETAIL_MAP_IDX 
+#undef _MASKMAP_IDX 
+#undef _SPECULAROCCLUSIONMAP_IDX 
 
 float3 BlendLayeredVector3(float3 x0, float3 x1, float3 x2, float3 x3, float weight[4])
 {
 {
     ZERO_INITIALIZE(LayerTexCoord, layerTexCoord);
 
-#if defined(_LAYER_MAPPING_TRIPLANAR_BLENDMASK) || defined(_LAYER_MAPPING_TRIPLANAR_0) || defined(_LAYER_MAPPING_TRIPLANAR_1) || defined(_LAYER_MAPPING_TRIPLANAR_2) || defined(_LAYER_MAPPING_TRIPLANAR_3)
+#if defined(_LAYER_MAPPING_TRIPLANAR_BLENDMASK) || defined(_LAYER_MAPPING_TRIPLANAR0) || defined(_LAYER_MAPPING_TRIPLANAR1) || defined(_LAYER_MAPPING_TRIPLANAR2) || defined(_LAYER_MAPPING_TRIPLANAR3)
     // one weight for each direction XYZ - Use vertex normal for triplanar
     layerTexCoord.triplanarWeights = ComputeTriplanarWeights(normalWS);
 #endif
 #endif  
 
     isTriplanar = false;
-#ifdef _LAYER_MAPPING_TRIPLANAR_0
+#ifdef _LAYER_MAPPING_TRIPLANAR0
     isTriplanar = true;
 #endif
 
                             );
 
     isTriplanar = false;
-#ifdef _LAYER_MAPPING_TRIPLANAR_1
+#ifdef _LAYER_MAPPING_TRIPLANAR1
     isTriplanar = true;
 #endif
     ComputeLayerTexCoord1(  texCoord0, texCoord1, texCoord2, texCoord3, 
-#ifdef _LAYER_MAPPING_TRIPLANAR_2
+#ifdef _LAYER_MAPPING_TRIPLANAR2
     isTriplanar = true;
 #endif
     ComputeLayerTexCoord2(  texCoord0, texCoord1, texCoord2, texCoord3, 
-#ifdef _LAYER_MAPPING_TRIPLANAR_3
+#ifdef _LAYER_MAPPING_TRIPLANAR3
     isTriplanar = true;
 #endif
     ComputeLayerTexCoord3(  texCoord0, texCoord1, texCoord2, texCoord3, 
 #if defined(_HEIGHTMAP0)
     if (layerTexCoord.base0.isTriplanar)
     {
-        minUvSize = min(layerTexCoord.base0.uvYZ * _HeightMap0_TexelSize.zw, minUvSize);
-        minUvSize = min(layerTexCoord.base0.uvZX * _HeightMap0_TexelSize.zw, minUvSize);
+        minUvSize = min(layerTexCoord.base0.uvZY * _HeightMap0_TexelSize.zw, minUvSize);
+        minUvSize = min(layerTexCoord.base0.uvXZ * _HeightMap0_TexelSize.zw, minUvSize);
         minUvSize = min(layerTexCoord.base0.uvXY * _HeightMap0_TexelSize.zw, minUvSize);
     }
     else
 #if defined(_HEIGHTMAP1)
     if (layerTexCoord.base1.isTriplanar)
     {
-        minUvSize = min(layerTexCoord.base1.uvYZ * _HeightMap1_TexelSize.zw, minUvSize);
-        minUvSize = min(layerTexCoord.base1.uvZX * _HeightMap1_TexelSize.zw, minUvSize);
+        minUvSize = min(layerTexCoord.base1.uvZY * _HeightMap1_TexelSize.zw, minUvSize);
+        minUvSize = min(layerTexCoord.base1.uvXZ * _HeightMap1_TexelSize.zw, minUvSize);
         minUvSize = min(layerTexCoord.base1.uvXY * _HeightMap1_TexelSize.zw, minUvSize);
     }
     else
 #if defined(_HEIGHTMAP2)
     if (layerTexCoord.base2.isTriplanar)
     {
-        minUvSize = min(layerTexCoord.base2.uvYZ * _HeightMap2_TexelSize.zw, minUvSize);
-        minUvSize = min(layerTexCoord.base2.uvZX * _HeightMap2_TexelSize.zw, minUvSize);
+        minUvSize = min(layerTexCoord.base2.uvZY * _HeightMap2_TexelSize.zw, minUvSize);
+        minUvSize = min(layerTexCoord.base2.uvXZ * _HeightMap2_TexelSize.zw, minUvSize);
         minUvSize = min(layerTexCoord.base2.uvXY * _HeightMap2_TexelSize.zw, minUvSize);
     }
     else
 #if defined(_HEIGHTMAP3)
     if (layerTexCoord.base3.isTriplanar)
     {
-        minUvSize = min(layerTexCoord.base3.uvYZ * _HeightMap3_TexelSize.zw, minUvSize);
-        minUvSize = min(layerTexCoord.base3.uvZX * _HeightMap3_TexelSize.zw, minUvSize);
+        minUvSize = min(layerTexCoord.base3.uvZY * _HeightMap3_TexelSize.zw, minUvSize);
+        minUvSize = min(layerTexCoord.base3.uvXZ * _HeightMap3_TexelSize.zw, minUvSize);
         minUvSize = min(layerTexCoord.base3.uvXY * _HeightMap3_TexelSize.zw, minUvSize);
     }
     else
             // apply the 3 offset on all layers
             /*
 
-            ppdParam.uv[0] = layerTexCoord.base0.uvYZ;
+            ppdParam.uv[0] = layerTexCoord.base0.uvZY;
             ppdParam.uv[1] = layerTexCoord.base1.uvYZ;
             ppdParam.uv[2] = layerTexCoord.base2.uvYZ;
             ppdParam.uv[3] = layerTexCoord.base3.uvYZ;
             ParallaxOcclusionMapping(lod, _PPDLodThreshold, numSteps, viewDirTS, maxHeight, ppdParam);
 
-            // Apply to all uvYZ
+            // Apply to all uvZY
-            // Repeat for uvZX
+            // Repeat for uvXZ
 
             // Repeat for uvXY
 
     surfaceData.metallic = SURFACEDATA_BLEND_SCALAR(surfaceData, metallic, weights);
 
     // Init other unused parameter
-    surfaceData.tangentWS = normalize(input.tangentToWorld[0].xyz);
+    surfaceData.tangentWS = input.tangentToWorld[0].xyz;
     surfaceData.materialId = 0;
     surfaceData.anisotropy = 0;
     surfaceData.specular = 0.04;

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitDataInternal.hlsl

                     ADD_IDX(_UVMappingMask).z * texCoord2 +
                     ADD_IDX(_UVMappingMask).w * texCoord3;
 
+    // Only used with layered, allow to have additional tiling
     uvBase *= additionalTiling.xx;
                     
 
                         ADD_IDX(_UVDetailsMappingMask).w * texCoord3;
 
-    // Note that if base is planar/triplanar, detail map is too
+    // If base is planar/triplanar then detail map is forced to be planar/triplanar
+    ADD_IDX(layerTexCoord.base).isPlanar = isPlanar;
+    ADD_IDX(layerTexCoord.base).isTriplanar = isTriplanar;
+    ADD_IDX(layerTexCoord.details).isPlanar = isPlanar;
+    ADD_IDX(layerTexCoord.details).isTriplanar = isTriplanar;
-    // planar
-    // TODO: Do we want to manage local or world triplanar/planar ? In this case update ApplyPerPixelDisplacement() too
-    //float3 position = localTriplanar ? TransformWorldToObject(positionWS) : positionWS;
-    float3 position = positionWS;
-    position *= worldScale;
+    // TODO: Currently we only handle world planar/triplanar but we may want local planar/triplanar.
+    // In this case both position and normal need to be convert to object space.
+    // planar/triplanar
+    float2 uvXZ;
+    float2 uvXY;
+    float2 uvZY;
+    GetTriplanarCoordinate(positionWS * worldScale, vertexNormalWS, uvXZ, uvXY, uvZY);
+ 
-        uvBase = -position.xz;
-        uvDetails = -position.xz;
-        ADD_IDX(layerTexCoord.base).isPlanar = true;
-        ADD_IDX(layerTexCoord.details).isPlanar = true;
-    }
-    else
-    {
-        ADD_IDX(layerTexCoord.base).isPlanar = false;
-        ADD_IDX(layerTexCoord.details).isPlanar = false;
+        uvBase = uvDetails = uvXZ;
+    // Apply tiling options
-    // triplanar
-    ADD_IDX(layerTexCoord.base).isTriplanar = isTriplanar;
-
-    float3 direction = sign(vertexNormalWS);
-
-    // In triplanar, if we are facing away from the world axis, a different axis will be flipped for each direction.
-    // This is particularly problematic for tangent space normal maps which need to be in the right direction.
-    // So we multiplying the offending coordinate by the sign of the normal.
-    float2 uvYZ = float2(direction.x * position.z, position.y);
-    float2 uvZX = -float2(position.x, direction.y * position.z);
-    float2 uvXY = float2(-position.x, direction.z * position.y);
-
-    ADD_IDX(layerTexCoord.base).uvYZ = TRANSFORM_TEX(uvYZ, ADD_IDX(_BaseColorMap));
-    ADD_IDX(layerTexCoord.base).uvZX = TRANSFORM_TEX(uvZX, ADD_IDX(_BaseColorMap));
+    ADD_IDX(layerTexCoord.base).uvXZ = TRANSFORM_TEX(uvXZ, ADD_IDX(_BaseColorMap));
+    ADD_IDX(layerTexCoord.base).uvZY = TRANSFORM_TEX(uvZY, ADD_IDX(_BaseColorMap));        
-    ADD_IDX(layerTexCoord.details).isTriplanar = isTriplanar;
-
-    ADD_IDX(layerTexCoord.details).uvYZ = TRANSFORM_TEX(uvYZ, ADD_IDX(_DetailMap));
-    ADD_IDX(layerTexCoord.details).uvZX = TRANSFORM_TEX(uvZX, ADD_IDX(_DetailMap));
+    ADD_IDX(layerTexCoord.details).uvXZ = TRANSFORM_TEX(uvXZ, ADD_IDX(_DetailMap));
+    ADD_IDX(layerTexCoord.details).uvZY = TRANSFORM_TEX(uvZY, ADD_IDX(_DetailMap));
 }
 
 float3 ADD_IDX(GetNormalTS)(FragInputs input, LayerTexCoord layerTexCoord, float3 detailNormalTS, float detailMask, bool useBias, float bias)
-    #ifdef _NORMALMAP
-        #ifdef _NORMALMAP_TANGENT_SPACE
-            if (useBias)
-            {
-                normalTS = SAMPLE_LAYER_NORMALMAP_BIAS(ADD_IDX(_NormalMap), ADD_ZERO_IDX(sampler_NormalMap), ADD_IDX(layerTexCoord.base), ADD_IDX(_NormalScale), bias);
-            }
-            else
-            {
-                normalTS = SAMPLE_LAYER_NORMALMAP(ADD_IDX(_NormalMap), ADD_ZERO_IDX(sampler_NormalMap), ADD_IDX(layerTexCoord.base), ADD_IDX(_NormalScale));
-            }            
-        #else // Object space
-            // to be able to combine object space normal with detail map we transform it to tangent space (object space normal composition is not simple).
-            // then later we will re-transform it to world space.
-            if (useBias)
-            {
-                float3 normalOS = SAMPLE_LAYER_NORMALMAP_RGB_BIAS(ADD_IDX(_NormalMap), ADD_ZERO_IDX(sampler_NormalMap), ADD_IDX(layerTexCoord.base), ADD_IDX(_NormalScale), bias).rgb;
-                normalTS = TransformObjectToTangent(normalOS, input.tangentToWorld);
-            }
-            else
-            {
-                float3 normalOS = SAMPLE_LAYER_NORMALMAP_RGB(ADD_IDX(_NormalMap), ADD_ZERO_IDX(sampler_NormalMap), ADD_IDX(layerTexCoord.base), ADD_IDX(_NormalScale)).rgb;
-                normalTS = TransformObjectToTangent(normalOS, input.tangentToWorld);
-            }
-        #endif
+#ifdef _NORMALMAP_IDX
+    #ifdef _NORMALMAP_TANGENT_SPACE_IDX
+    if (useBias)
+    {
+        normalTS = SAMPLE_LAYER_NORMALMAP_BIAS(ADD_IDX(_NormalMap), ADD_ZERO_IDX(sampler_NormalMap), ADD_IDX(layerTexCoord.base), ADD_IDX(_NormalScale), bias);
+    }
+    else
+    {
+        normalTS = SAMPLE_LAYER_NORMALMAP(ADD_IDX(_NormalMap), ADD_ZERO_IDX(sampler_NormalMap), ADD_IDX(layerTexCoord.base), ADD_IDX(_NormalScale));
+    }            
+    #else // Object space
+    // to be able to combine object space normal with detail map we transform it to tangent space (object space normal composition is complex operation).
+    // then later we will re-transform it to world space.
+    if (useBias)
+    {
+        float3 normalOS = SAMPLE_LAYER_NORMALMAP_RGB_BIAS(ADD_IDX(_NormalMap), ADD_ZERO_IDX(sampler_NormalMap), ADD_IDX(layerTexCoord.base), ADD_IDX(_NormalScale), bias).rgb;
+        normalTS = TransformObjectToTangent(normalOS, input.tangentToWorld);
+    }
+    else
+    {
+        float3 normalOS = SAMPLE_LAYER_NORMALMAP_RGB(ADD_IDX(_NormalMap), ADD_ZERO_IDX(sampler_NormalMap), ADD_IDX(layerTexCoord.base), ADD_IDX(_NormalScale)).rgb;
+        normalTS = TransformObjectToTangent(normalOS, input.tangentToWorld);
+    }
+    #endif
-        #ifdef _DETAIL_MAP
-            normalTS = lerp(normalTS, BlendNormalRNM(normalTS, detailNormalTS), detailMask);
-        #endif
-    #else
-        normalTS = float3(0.0, 0.0, 1.0);
+    #ifdef _DETAIL_MAP_IDX
+    normalTS = lerp(normalTS, BlendNormalRNM(normalTS, detailNormalTS), detailMask);
+#else
+    normalTS = float3(0.0, 0.0, 1.0);
+#endif
-    #if defined(_DOUBLESIDED_LIGHTING_FLIP) || defined(_DOUBLESIDED_LIGHTING_MIRROR)
-        #ifdef _DOUBLESIDED_LIGHTING_FLIP
-            float3 oppositeNormalTS = -normalTS;
-        #else
-            // Mirror the normal with the plane define by vertex normal
-            float3 oppositeNormalTS = reflect(normalTS, float3(0.0, 0.0, 1.0)); // Reflect around vertex normal (in tangent space this is z)
-        #endif
-        // TODO : Test if GetOddNegativeScale() is necessary here in case of normal map, as GetOddNegativeScale is take into account in CreateTangentToWorld();
-        normalTS = input.isFrontFace ?
-                        (GetOddNegativeScale() >= 0.0 ? normalTS : oppositeNormalTS) :
-                        (-GetOddNegativeScale() >= 0.0 ? normalTS : oppositeNormalTS);
+#if defined(_DOUBLESIDED_LIGHTING_FLIP) || defined(_DOUBLESIDED_LIGHTING_MIRROR)
+    #ifdef _DOUBLESIDED_LIGHTING_FLIP
+    float3 oppositeNormalTS = -normalTS;
+    #else
+    // Mirror the normal with the plane define by vertex normal
+    float3 oppositeNormalTS = reflect(normalTS, float3(0.0, 0.0, 1.0)); // Reflect around vertex normal (in tangent space this is z)
+    // TODO : Test if GetOddNegativeScale() is necessary here in case of normal map, as GetOddNegativeScale is take into account in CreateTangentToWorld();
+    normalTS = input.isFrontFace ?
+                    (GetOddNegativeScale() >= 0.0 ? normalTS : oppositeNormalTS) :
+                    (-GetOddNegativeScale() >= 0.0 ? normalTS : oppositeNormalTS);
+#endif
 
     return normalTS;
 }
 {
-#ifdef _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
-    float alpha = ADD_IDX(_BaseColor).a;
-#else
-#endif
 
     // Perform alha test very early to save performance (a killed pixel will not sample textures)
 #if defined(_ALPHATEST_ON) && !defined(LAYERED_LIT_SHADER)
     float3 detailNormalTS = float3(0.0, 0.0, 0.0);
     float detailMask = 0.0;
-#ifdef _DETAIL_MAP
+#ifdef _DETAIL_MAP_IDX
-    #ifdef _DETAIL_MAP_WITH_NORMAL
-    //float detailAO = 0.0;
-    #else
-    // TODO: Use heightmap as a derivative with Morten Mikklesen approach, how this work with our abstraction and triplanar ?
-    detailNormalTS = float3(0.0, 0.0, 1.0);
-    //float detailAO = detail.b;
-    #endif
-#ifdef _DETAIL_MAP
+#ifdef _DETAIL_MAP_IDX
-#ifdef _SPECULAROCCLUSIONMAP
+#ifdef _SPECULAROCCLUSIONMAP_IDX
     // TODO: Do something. For now just take alpha channel
     surfaceData.specularOcclusion = SAMPLE_LAYER_TEXTURE2D(ADD_IDX(_SpecularOcclusionMap), ADD_ZERO_IDX(sampler_SpecularOcclusionMap), ADD_IDX(layerTexCoord.base)).a;
 #else
-    surfaceData.normalWS = float3(0.0, 0.0, 0.0); // Need to init this so that the compiler leaves us alone.
+    surfaceData.normalWS = float3(0.0, 0.0, 0.0); // Need to init this to keep quiet the compiler, but this is overriden later (0, 0, 0) so if we forget to override the compiler may comply.
-#ifdef _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
-    surfaceData.perceptualSmoothness = SAMPLE_LAYER_TEXTURE2D(ADD_IDX(_BaseColorMap), ADD_ZERO_IDX(sampler_BaseColorMap), ADD_IDX(layerTexCoord.base)).a;
-#elif defined(_MASKMAP)
+#if defined(_MASKMAP_IDX)
-#ifdef _DETAIL_MAP
+#ifdef _DETAIL_MAP_IDX
-    // MaskMap is Metallic, Ambient Occlusion, (Optional) - emissive Mask, Optional - Smoothness (in alpha)
-#ifdef _MASKMAP
+    // MaskMap is RGBA: Metallic, Ambient Occlusion (Optional), emissive Mask (Optional), Smoothness
+#ifdef _MASKMAP_IDX
     surfaceData.metallic = SAMPLE_LAYER_TEXTURE2D(ADD_IDX(_MaskMap), ADD_ZERO_IDX(sampler_MaskMap), ADD_IDX(layerTexCoord.base)).r;
     surfaceData.ambientOcclusion = SAMPLE_LAYER_TEXTURE2D(ADD_IDX(_MaskMap), ADD_ZERO_IDX(sampler_MaskMap), ADD_IDX(layerTexCoord.base)).g;
 #else
 
     // TODO: think about using BC5
 #ifdef _TANGENTMAP
-#ifdef _NORMALMAP_TANGENT_SPACE // Normal and tangent use same space
+#ifdef _NORMALMAP_TANGENT_SPACE_IDX // Normal and tangent use same space
     float3 tangentTS = SAMPLE_LAYER_NORMALMAP(ADD_IDX(_TangentMap), ADD_ZERO_IDX(sampler_TangentMap), ADD_IDX(layerTexCoord.base), 1.0);
     surfaceData.tangentWS = TransformTangentToWorld(tangentTS, input.tangentToWorld);
 #else // Object space
 #else
-    surfaceData.tangentWS = normalize(input.tangentToWorld[0].xyz);
+    surfaceData.tangentWS = input.tangentToWorld[0].xyz;
 #endif
     // TODO: Is there anything todo regarding flip normal but for the tangent ?
 
     surfaceData.specular = 0.04;
 
     surfaceData.subsurfaceProfile = _SubsurfaceProfile;
-#ifdef _Subsurface_RADIUS_MAP
-	surfaceData.subsurfaceProfile = SAMPLE_LAYER_TEXTURE2D(ADD_IDX(_SubsurfaceRadiusMap), ADD_ZERO_IDX(sampler_SubsurfaceRadiusMap), ADD_IDX(layerTexCoord.base)).r;
+#ifdef _SUBSURFACE_RADIUS_MAP
+	surfaceData.subsurfaceRadius = SAMPLE_LAYER_TEXTURE2D(ADD_IDX(_SubsurfaceRadiusMap), ADD_ZERO_IDX(sampler_SubsurfaceRadiusMap), ADD_IDX(layerTexCoord.base)).r * _SubsurfaceRadius;
+    surfaceData.subsurfaceProfile = 0;
+
 #ifdef _THICKNESS_MAP
 	surfaceData.thickness = SAMPLE_LAYER_TEXTURE2D(ADD_IDX(_ThicknessMap), ADD_ZERO_IDX(sampler_ThicknessMap), ADD_IDX(layerTexCoord.base)).r;
 #else

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl

 float _DetailAlbedoScale;
 float _DetailNormalScale;
 float _DetailSmoothnessScale;
-float _DetailHeightScale;
-float _DetailAOScale;
 
 TEXTURE2D(_HeightMap);
 SAMPLER2D(sampler_HeightMap);
 PROP_DECL(float, _DetailAlbedoScale);
 PROP_DECL(float, _DetailNormalScale);
 PROP_DECL(float, _DetailSmoothnessScale);
-PROP_DECL(float, _DetailHeightScale);
-PROP_DECL(float, _DetailAOScale);
 
 PROP_DECL(float, _HeightAmplitude);
 PROP_DECL(float, _HeightCenter);

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitTessellation.shader

         _HeightAmplitude("Height Amplitude", Float) = 0.01 // In world units
         _HeightCenter("Height Center", Float) = 0.5 // In texture space
 
-        _TangentMap("TangentMap", 2D) = "bump" {}
-        _Anisotropy("Anisotropy", Range(0.0, 1.0)) = 0
-        _AnisotropyMap("AnisotropyMap", 2D) = "white" {}
-
-        _DetailHeightScale("_DetailHeightScale", Range(-2.0, 2.0)) = 1
-        _DetailAOScale("_DetailAOScale", Range(-2.0, 2.0)) = 1
+
+        _TangentMap("TangentMap", 2D) = "bump" {}
+        _Anisotropy("Anisotropy", Range(0.0, 1.0)) = 0
+        _AnisotropyMap("AnisotropyMap", 2D) = "white" {}
-        _SubsurfaceRadius("Subsurface Radius", Range(0.004, 1.0)) = 0.5
+        _SubsurfaceRadius("Subsurface Radius", Range(0.004, 1.0)) = 1.0
         _SubsurfaceRadiusMap("Subsurface Radius Map", 2D) = "white" {}
         _Thickness("Thickness", Range(0.004, 1.0)) = 0.5
         _ThicknessMap("Thickness Map", 2D) = "white" {}
 
         [Enum(None, 0, DoubleSided, 1, DoubleSidedLigthingFlip, 2, DoubleSidedLigthingMirror, 3)] _DoubleSidedMode("Double sided mode", Float) = 0
 
-        [Enum(Mask Alpha, 0, BaseColor Alpha, 1)] _SmoothnessTextureChannel("Smoothness texture channel", Float) = 1
         [Enum(UV0, 0, Planar, 1, TriPlanar, 2)] _UVBase("UV Set for base", Float) = 0
         _TexWorldScale("Scale to apply on world coordinate", Float) = 1.0
         [HideInInspector] _UVMappingMask("_UVMappingMask", Color) = (1, 0, 0, 0)
         _PPDMinSamples("Min sample for POM", Range(1.0, 64.0)) = 5
         _PPDMaxSamples("Max sample for POM", Range(1.0, 64.0)) = 15
         _PPDLodThreshold("Start lod to fade out the POM effect", Range(0.0, 16.0)) = 5
-        [Enum(DetailMapNormal, 0, DetailMapAOHeight, 1)] _DetailMapMode("DetailMap mode", Float) = 0
         [Enum(UV0, 0, UV1, 1, UV2, 2, UV3, 3)] _UVDetail("UV Set for detail", Float) = 0
         [HideInInspector] _UVDetailsMappingMask("_UVDetailsMappingMask", Color) = (1, 0, 0, 0)
         [Enum(Use Emissive Color, 0, Use Emissive Mask, 1)] _EmissiveColorMode("Emissive color mode", Float) = 1
     #pragma shader_feature _ _TESSELLATION_DISPLACEMENT _TESSELLATION_DISPLACEMENT_PHONG
     #pragma shader_feature _TESSELLATION_OBJECT_SCALE
 
-    #pragma shader_feature _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
-    #pragma shader_feature _DETAIL_MAP_WITH_NORMAL
-    #pragma shader_feature _NORMALMAP
+    #pragma shader_feature _NORMALMAP  
     #pragma shader_feature _MASKMAP
     #pragma shader_feature _SPECULAROCCLUSIONMAP
     #pragma shader_feature _EMISSIVE_COLOR_MAP
             HLSLPROGRAM
 
             // Lightmap memo
-            // DYNAMICLIGHTMAP_ON is used when we have an "enlighten lightmap" ie a lightmap updated at runtime by enlighten.This lightmap contain indirect lighting from realtime lights and realtime emissive material.Offline baked lighting(from baked material / light,
+            // DYNAMICLIGHTMAP_ON is used when we have an "enlighten lightmap" ie a lightmap updated at runtime by enlighten.This lightmap contain indirect lighting from realtime lights and realtime emissive material.Offline baked lighting(from baked material / light, 
             // both direct and indirect lighting) will hand up in the "regular" lightmap->LIGHTMAP_ON.
 
             // No tessellation for Meta pass
             #include "../../Lighting/Forward.hlsl"
             #include "HDRenderPipeline/Debug/HDRenderPipelineDebug.cs.hlsl"
             #include "HDRenderPipeline/Debug/DebugLighting.hlsl"
+
             // TEMP until pragma work in include
             #pragma multi_compile LIGHTLOOP_SINGLE_PASS LIGHTLOOP_TILE_PASS
 
             #include "../../ShaderPass/ShaderPassForward.hlsl"
 
-                ENDHLSL
+            ENDHLSL
+
     }
 
     CustomEditor "Experimental.Rendering.HDPipeline.LitGUI"

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/SampleLayer.hlsl

     bool isPlanar; // mutually exclusive with isTriplanar
     // triplanar
     bool isTriplanar;
-    float2 uvYZ;
-    float2 uvZX;
+    float2 uvZY;
+    float2 uvXZ;
     float2 uvXY;
 };
 

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/SampleLayerInternal.hlsl

         float4 val = float4(0.0, 0.0, 0.0, 0.0);
 
         if (triplanarWeights.x > 0.0)
-            val += triplanarWeights.x * SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvYZ, param);
+            val += triplanarWeights.x * SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvZY, param);
-            val += triplanarWeights.y * SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvZX, param);
+            val += triplanarWeights.y * SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvXZ, param);
         if (triplanarWeights.z > 0.0)
             val += triplanarWeights.z * SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvXY, param);
 
         float3 val = float3(0.0, 0.0, 0.0);
 
         if (triplanarWeights.x > 0.0)
-            val += triplanarWeights.x * UnpackNormalAG(SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvYZ, param), scale);
+            val += triplanarWeights.x * UnpackNormalAG(SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvZY, param), scale);
-            val += triplanarWeights.y * UnpackNormalAG(SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvZX, param), scale);
+            val += triplanarWeights.y * UnpackNormalAG(SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvXZ, param), scale);
         if (triplanarWeights.z > 0.0)
             val += triplanarWeights.z * UnpackNormalAG(SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvXY, param), scale);
 
         float3 val = float3(0.0, 0.0, 0.0);
 
         if (triplanarWeights.x > 0.0)
-            val += triplanarWeights.x * UnpackNormalAG(SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvYZ, param), scale);
+            val += triplanarWeights.x * UnpackNormalAG(SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvZY, param), scale);
-            val += triplanarWeights.y * UnpackNormalAG(SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvZX, param), scale);
+            val += triplanarWeights.y * UnpackNormalAG(SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvXZ, param), scale);
         if (triplanarWeights.z > 0.0)
             val += triplanarWeights.z * UnpackNormalAG(SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvXY, param), scale);
 
         float3 val = float3(0.0, 0.0, 0.0);
 
         if (triplanarWeights.x > 0.0)
-            val += triplanarWeights.x * UnpackNormalRGB(SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvYZ, param), scale);
+            val += triplanarWeights.x * UnpackNormalRGB(SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvZY, param), scale);
-            val += triplanarWeights.y * UnpackNormalRGB(SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvZX, param), scale);
+            val += triplanarWeights.y * UnpackNormalRGB(SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvXZ, param), scale);
         if (triplanarWeights.z > 0.0)
             val += triplanarWeights.z * UnpackNormalRGB(SAMPLE_TEXTURE_FUNC(layerTex, layerSampler, layerUV.uvXY, param), scale);
 

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/BaseUnlitUI.cs

             public static readonly string[] surfaceTypeNames = Enum.GetNames(typeof(SurfaceType));
             public static readonly string[] blendModeNames = Enum.GetNames(typeof(BlendMode));
 
-            public static string InputsOptionsText = "Inputs options";
-
             public static string InputsText = "Inputs";
 
             public static string InputsMapText = "";
                 ShaderOptionsGUI();
                 EditorGUILayout.Space();
 
-                ShaderInputOptionsGUI();
-
                 EditorGUILayout.Space();
                 ShaderInputGUI();
             }
 
         protected abstract void FindMaterialProperties(MaterialProperty[] props);
         protected abstract void ShaderInputGUI();
-        protected abstract void ShaderInputOptionsGUI();
 		protected abstract void SetupMaterialKeywords(Material material);
         protected abstract bool ShouldEmissionBeEnabled(Material material);
     }

Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/UnlitUI.cs

             EditorGUI.indentLevel--;
         }
 
-        override protected void ShaderInputOptionsGUI()
-        {
-        }
-
         protected override void SetupMaterialKeywords(Material material)
         {
 			SetupCommonOptionsKeywords(material);

Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/FragInputs.hlsl

     float2 texCoord1;
     float2 texCoord2;
     float2 texCoord3;
-    float3 tangentToWorld[3];
+    float3 tangentToWorld[3]; // These 3 vectors are normalized (no need for the material to normalize) and these are only for UVSet 0
     float4 color; // vertex color
 
     // For two sided lighting

Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/VaryingMesh.hlsl

     float3 positionWS;
 #endif
 #ifdef VARYINGS_NEED_TANGENT_TO_WORLD
-    float3 tangentToWorld[3];
+    float3 normalWS;
+    float4 tangentWS;  // w contain mirror sign
 #endif
 #ifdef VARYINGS_NEED_TEXCOORD0
     float2 texCoord0;
 {
     float4 positionCS : SV_Position;
 
+#ifdef VARYINGS_NEED_POSITION_WS
+    float3 interpolators0 : TEXCOORD0;
+#endif
+
-    #ifdef VARYINGS_NEED_POSITION_WS
-    // if present, pack positionWS
-    float4 interpolators1 : TEXCOORD1;
-    float4 interpolators2 : TEXCOORD2;
-    float4 interpolators3 : TEXCOORD3;
-    #else
-    float3 interpolators2 : TEXCOORD2;
-    float3 interpolators3 : TEXCOORD3;
-    #endif
-#else
-    #ifdef VARYINGS_NEED_POSITION_WS
-    float3 interpolators0 : TEXCOORD0;
-    #endif
+    float4 interpolators2 : TEXCOORD2;
-    float4 interpolators4 : TEXCOORD4;
+    float4 interpolators3 : TEXCOORD3;
-    float2 interpolators4 : TEXCOORD4;
+    float2 interpolators3 : TEXCOORD3;
-    float4 interpolators5 : TEXCOORD5;
+    float4 interpolators4 : TEXCOORD4;
-    float2 interpolators5 : TEXCOORD5;
+    float2 interpolators4 : TEXCOORD4;
-    float4 interpolators6 : TEXCOORD6;
+    float4 interpolators5 : TEXCOORD5;
 #endif
 
 #if defined(VARYINGS_NEED_CULLFACE) && SHADER_STAGE_FRAGMENT
 
     output.positionCS = input.positionCS;
 
-#ifdef VARYINGS_NEED_TANGENT_TO_WORLD
-    output.interpolators1.xyz = input.tangentToWorld[0];
-    output.interpolators2.xyz = input.tangentToWorld[1];
-    output.interpolators3.xyz = input.tangentToWorld[2];
-    #ifdef VARYINGS_NEED_POSITION_WS
-    output.interpolators1.w = input.positionWS.x;
-    output.interpolators2.w = input.positionWS.y;
-    output.interpolators3.w = input.positionWS.z;
-    #endif
-#else
-    #ifdef VARYINGS_NEED_POSITION_WS
+#ifdef VARYINGS_NEED_POSITION_WS
-    #endif
+#endif
+
+#ifdef VARYINGS_NEED_TANGENT_TO_WORLD
+    output.interpolators1 = input.normalWS;
+    output.interpolators2 = input.tangentWS;
-    output.interpolators4.xy = input.texCoord0;
+    output.interpolators3.xy = input.texCoord0;
-    output.interpolators4.zw = input.texCoord1;
+    output.interpolators3.zw = input.texCoord1;
-    output.interpolators5.xy = input.texCoord2;
+    output.interpolators4.xy = input.texCoord2;
-    output.interpolators5.zw = input.texCoord3;
+    output.interpolators4.zw = input.texCoord3;
-    output.interpolators6 = input.color;
+    output.interpolators5 = input.color;
 #endif
 
     return output;
 
     output.unPositionSS = input.positionCS; // input.positionCS is SV_Position
 
+#ifdef VARYINGS_NEED_POSITION_WS
+    output.positionWS.xyz = input.interpolators0.xyz;
+#endif
+
-    output.tangentToWorld[0] = input.interpolators1.xyz;
-    output.tangentToWorld[1] = input.interpolators2.xyz;
-    output.tangentToWorld[2] = input.interpolators3.xyz;
-    #ifdef VARYINGS_NEED_POSITION_WS
-    output.positionWS.xyz = float3(input.interpolators1.w, input.interpolators2.w, input.interpolators3.w);
-    #endif
-#else
-    #ifdef VARYINGS_NEED_POSITION_WS
-    output.positionWS.xyz = input.interpolators0.xyz;
-    #endif
+    // Normalize the normal/tangent after interpolation
+    float3 normalWS = normalize(input.interpolators1);
+    float4 tangentWS = float4(normalize(input.interpolators2.xyz), input.interpolators2.w);
+    float3x3 tangentToWorld = CreateTangentToWorld(normalWS, tangentWS.xyz, tangentWS.w);
+    output.tangentToWorld[0] = tangentToWorld[0];
+    output.tangentToWorld[1] = tangentToWorld[1];
+    output.tangentToWorld[2] = tangentToWorld[2];
-    output.texCoord0 = input.interpolators4.xy;
+    output.texCoord0 = input.interpolators3.xy;
-    output.texCoord1 = input.interpolators4.zw;
+    output.texCoord1 = input.interpolators3.zw;
-    output.texCoord2 = input.interpolators5.xy;
+    output.texCoord2 = input.interpolators4.xy;
-    output.texCoord3 = input.interpolators5.zw;
+    output.texCoord3 = input.interpolators4.zw;
-    output.color = input.interpolators6;
+    output.color = input.interpolators5;
 #endif
 
 #if defined(VARYINGS_NEED_CULLFACE) && SHADER_STAGE_FRAGMENT

Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/VertMesh.hlsl

     #endif
     output.positionCS = TransformWorldToHClip(positionWS);
     #ifdef VARYINGS_NEED_TANGENT_TO_WORLD
-    float3 normalWS = TransformObjectToWorldNormal(input.normalOS);
-    float4 tangentWS = float4(TransformObjectToWorldDir(input.tangentOS.xyz), input.tangentOS.w);
-
-    float3x3 tangentToWorld = CreateTangentToWorld(normalWS, tangentWS.xyz, tangentWS.w);
-    output.tangentToWorld[0] = tangentToWorld[0];
-    output.tangentToWorld[1] = tangentToWorld[1];
-    output.tangentToWorld[2] = tangentToWorld[2];
+    output.normalWS = TransformObjectToWorldNormal(input.normalOS);
+    output.tangentWS = float4(TransformObjectToWorldDir(input.tangentOS.xyz), input.tangentOS.w);
     #endif
 #endif
 
 {
     VaryingsMeshToPS output;
 
+    output.positionCS = TransformWorldToHClip(input.positionWS);
+
-    output.positionCS = TransformWorldToHClip(input.positionWS);
+
-    float3x3 tangentToWorld = CreateTangentToWorld(input.normalWS, input.tangentWS.xyz, input.tangentWS.w);
-    output.tangentToWorld[0] = tangentToWorld[0];
-    output.tangentToWorld[1] = tangentToWorld[1];
-    output.tangentToWorld[2] = tangentToWorld[2];
+    output.normalWS = input.normalWS;
+    output.tangentWS = input.tangentWS;
 #endif
 
 #ifdef VARYINGS_NEED_TEXCOORD0

Assets/ScriptableRenderPipeline/ShaderLibrary/CommonMaterial.hlsl

     return blendWeights;
 }
 
+// Planar/Triplanar convention for Unity
+// position and vertex normal must be in the same space
+void GetTriplanarCoordinate(float3 position, float3 vertexNormal, out float2 uvXZ, out float2 uvXY, out float2 uvZY)
+{
+    float3 direction = sign(vertexNormal);
+
+    // In triplanar, if we are facing away from the world axis, a different axis will be flipped for each direction.
+    // This is particularly problematic for tangent space normal maps which need to be in the right direction.
+    // So we multiplying the offending coordinate by the sign of the normal.
+    uvXZ = -float2(position.x, direction.y * position.z);
+    uvXY = float2(-position.x, direction.z * position.y);
+    uvZY = float2(direction.x * position.z, position.y);
+}
+
 float LerpWhiteTo(float b, float t)
 {
     float oneMinusT = 1.0 - t;

Assets/TestScenes/HDTest/GraphicTest/Tessellation/Material/Tessellation - Rock.mat

   m_Name: Tessellation - Rock
   m_Shader: {fileID: 4800000, guid: 756bac9090102564582875f4c7e30202, type: 3}
   m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DEPTHOFFSETENABLE_OFF _DETAIL_MAP_WITH_NORMAL
-    _DISTORTIONDEPTHTEST_OFF _DISTORTIONENABLE_OFF _DISTORTIONONLY_OFF _ENABLEPERPIXELDISPLACEMENT_OFF
-    _HEIGHTMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE _TESSELLATIONOBJECTSCALE_OFF _TESSELLATION_DISPLACEMENT
+    _DISTORTIONDEPTHTEST_OFF _DISTORTIONENABLE_OFF _DISTORTIONONLY_OFF _EMISSIVE_COLOR
+    _ENABLEPERPIXELDISPLACEMENT_OFF _HEIGHTMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+    _TESSELLATIONOBJECTSCALE_OFF _TESSELLATION_DISPLACEMENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_CustomRenderQueue: -1
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SubsurfaceRadiusMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ThicknessMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _DistortionOnly: 0
     - _DoubleSidedMode: 0
     - _DstBlend: 0
-    - _EmissiveColorMode: 1
+    - _EmissiveColorMode: 0
     - _EmissiveIntensity: 0
     - _EnablePerPixelDisplacement: 0
     - _GlossMapScale: 1
     - _HeightCenter: 0.5
+    - _HorizonFade: 1
+    - _MaterialID: 0
     - _MaterialId: 0
     - _Metallic: 0
     - _Mode: 0
+    - _PPDLodThreshold: 5
     - _PPDMaxSamples: 15
     - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _SrcBlend: 1
+    - _StencilRef: 0
+    - _SubsurfaceProfile: 0
+    - _SubsurfaceRadius: 1
     - _SurfaceType: 0
     - _TessellationBackFaceCullEpsilon: -0.25
     - _TessellationFactor: 10
     - _TessellationObjectScale: 0
     - _TessellationShapeFactor: 0.75
     - _TexWorldScale: 1
+    - _Thickness: 0.5
     - _UVBase: 0
     - _UVDetail: 0
     - _UVMappingPlanar: 0

Assets/TestScenes/HDTest/LayeredLitTest.unity

   m_InflateMesh: 0
   m_SkinWidth: 0.01
   m_Mesh: {fileID: 839664087}
---- !u!43 &999948662
-Mesh:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_Name: vpp_Plane_NoRot
-  serializedVersion: 8
-  m_SubMeshes:
-  - serializedVersion: 2
-    firstByte: 0
-    indexCount: 96
-    topology: 0
-    firstVertex: 0
-    vertexCount: 25
-    localAABB:
-      m_Center: {x: 0, y: 0, z: 0}
-      m_Extent: {x: 10.000002, y: 10.000002, z: 0.0000008742278}
-  m_Shapes:
-    vertices: []
-    shapes: []
-    channels: []
-    fullWeights: []
-  m_BindPose: []
-  m_BoneNameHashes: 
-  m_RootBoneNameHash: 0
-  m_MeshCompression: 0
-  m_IsReadable: 1
-  m_KeepVertices: 1
-  m_KeepIndices: 1
-  m_IndexBuffer: 00000100020000000200030003000200040003000400050005000400060005000600070007000600080007000800090001000a00020001000b000a0002000a000c0002000c00040004000c000d0004000d00060006000d000e0006000e0008000b000f000a000b0010000f000a000f0011000a0011000c000c00110012000c0012000d000d00120013000d0013000e00100014000f001000150014000f00140016000f0016001100110016001700110017001200120017001800120018001300
-  m_Skin: []
-  m_VertexData:
-    m_CurrentChannels: 255
-    m_VertexCount: 25
-    m_Channels:
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 3
-    - stream: 0
-      offset: 12
-      format: 0
-      dimension: 3
-    - stream: 0
-      offset: 24
-      format: 0
-      dimension: 4
-    - stream: 0
-      offset: 40
-      format: 0
-      dimension: 2
-    - stream: 0
-      offset: 48
-      format: 0
-      dimension: 2
-    - stream: 0
-      offset: 56
-      format: 0
-      dimension: 2
-    - stream: 0
-      offset: 64
-      format: 0
-      dimension: 2
-    - stream: 0
-      offset: 72
-      format: 0
-      dimension: 4
-    m_DataSize: 2200
-    _typelessdata: 020020c1feff1fc10000002900000000000000000000803f0000000000000000000000000000803ffeff7f3f00000033d4fd4d3e9c3c10be326ca43fe8df5bbfb072803fec85b0bf000080bf0000000000000000000080bf0300a0c0ffff1fc17cac6a3400000000000000000000803f0000000000000000000000000000803fffff3f3f0000003370deec3d2ca6c03d52aa3f3f061e37bf22d2d03e1d8184bf000080bf0000000000000000000080bf0200a0c0feff9fc00000802800000000000000000000803f0000000000000000000000000000803fffff3f3f0000803e757fb33eb2e1373e326c643fd0bf37beb072403fd80be1be000080bf0000000000000000000080bf010020c1fdff9fc079ac6ab400000000000000000000803f0000000000000000000000000000803ffeff7f3f0000803ec346df3e00b862bd23cdb63fa863a5be7f77ac3f8c8f48bf000080bf0000000000000000000080bf0000a0c01fab5a357aac6ab400000000000000000000803f0000000000000000000000000000803f0000403fffffff3ea7e3153f27b8873e0a97843f3f7cb63e273e8c3f86d91f3e000080bf0000000000000000000080bf000020c11fabda357aaceab400000000000000000000803f0000000000000000000000000000803fffff7f3fffffff3e4ec72b3fe004f73c132ec93ffcf0593e4e7cd83ff44c40be000080bf0000000000000000000080bffeff9fc00200a0407aaceab400000000000000000000803f0000000000000000000000000000803f0000403fffff3f3f9407523f757fb33efaf7963f326c643ff642b83fb072403f000080bf0000000000000000000080bfffff1fc10300a0405c0130b500000000000000000000803f0000000000000000000000000000803f0000803fffff3f3f3aeb673f70deec3d038fdb3f52aa3f3f8e40024022d2d03e000080bf0000000000000000000080bffdff9fc0010020415c0130b500000000000000000000803f0000000000000000000000000000803f0000403ffeff7f3fc015873fc346df3eea58a93f23cdb63fc647e43f7f77ac3f000080bf0000000000000000000080bffeff1fc1020020417aac6ab500000000000000000000803f0000000000000000000000000000803f0000803ffeff7f3f9407923fd4fd4d3ef4efed3f326ca43ff6421840b072803f000080bf0000000000000000000080bf1fab5ab50000a0c07bac6a3400000000000000000000803f0000000000000000000000000000803fffffff3e0100803e27b8873eb238d43e3f7cb63e30e112bd86d91f3e70e2c3bd000080bf0000000000000000000080bf1fabdab5000020c17bacea3400000000000000000000803f0000000000000000000000000000803fffffff3e00008033e004f73c6471a83efcf0593e265c12bff44c40be9cf830bf000080bf0000000000000000000080bf00000000000000000000000000000000000000000000803f0000000000000000000000000000803f0000003f0000003f0000003f0000003f0000003f0000003f0000003f0000003f000080bf0000000000000000000080bf1fab5a350000a0407bac6ab400000000000000000000803f0000000000000000000000000000803f0000003f0000403fec233c3fa7e3153fe0c1243f0a97843f9e09583f273e8c3f000080bf0000000000000000000080bf1fabda35000020417baceab400000000000000000000803f0000000000000000000000000000803f0100003fffff7f3fd947783f4ec72b3fc183493f132ec93f9e09983f4e7cd83f000080bf0000000000000000000080bffeff9f400200a0c07aacea3400000000000000000000803f0000000000000000000000000000803f0000803e0200803eb2e1373e4640263fd0bf37be6c9edc3dd80be1be42357e3e000080bf0000000000000000000080bffdff9f40010020c15c01303500000000000000000000803f0000000000000000000000000000803f0000803e0000c03300b862bd9e5c103fa863a5be8c34dbbe8c8f48bffcddb1be000080bf0000000000000000000080bf0000a0401fab5ab57aac6a3400000000000000000000803f0000000000000000000000000000803f0100803e0000003fb238d43eec233c3f30e112bde0c1243f70e2c3bd9e09583f000080bf0000000000000000000080bf0200a040feff9f40000080a800000000000000000000803f0000000000000000000000000000803f0200803e0000403f4640263f9407523f6c9edc3dfaf7963f42357e3ef642b83f000080bf0000000000000000000080bf0300a040ffff1f417cac6ab400000000000000000000803f0000000000000000000000000000803f0200803e0000803f3264623f3aeb673f5cab803e038fdb3fef96173f8e400240000080bf0000000000000000000080bfffff1f410300a0c05c01303500000000000000000000803f0000000000000000000000000000803f000000330200803e2ca6c03d3264623f061e37bf5cab803e1d8184bfef96173f000080bf0000000000000000000080bffeff1f41020020c17aac6a3500000000000000000000803f0000000000000000000000000000803f000000330000c0339c3c10be8b804c3fe8df5bbfcab091beec85b0bf005f65bb000080bf0000000000000000000080bf000020411fabdab57aacea3400000000000000000000803f0000000000000000000000000000803f000080330100003f6471a83ed947783f265c12bfc183493f9cf830bf9e09983f000080bf0000000000000000000080bf01002041fdff9f4079ac6a3400000000000000000000803f0000000000000000000000000000803f0000c0330000403f9e5c103fc015873f8c34dbbeea58a93ffcddb1bec647e43f000080bf0000000000000000000080bf02002041feff1f41000000a900000000000000000000803f0000000000000000000000000000803f0000c0330000803f8b804c3f9407923fcab091bef4efed3f005f65bbf6421840000080bf0000000000000000000080bf
-  m_CompressedMesh:
-    m_Vertices:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UV:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Normals:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Tangents:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Weights:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_NormalSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_TangentSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_FloatColors:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_BoneIndices:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Triangles:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UVInfo: 0
-  m_LocalAABB:
-    m_Center: {x: 0, y: 0, z: 0}
-    m_Extent: {x: 10.000002, y: 10.000002, z: 0.0000008742278}
-  m_MeshUsageFlags: 0
-  m_BakedConvexCollisionMesh: 
-  m_BakedTriangleCollisionMesh: 
-  m_MeshOptimized: 1
 --- !u!1001 &1024688196
 Prefab:
   m_ObjectHideFlags: 0
     m_Modifications:
     - target: {fileID: 400000, guid: 4728f0e7b47aa304692c028e76915b5f, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -45
+      value: -45.2
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: 4728f0e7b47aa304692c028e76915b5f, type: 3}
       propertyPath: m_LocalPosition.y
   m_Script: {fileID: 11500000, guid: f9280e97edc9b45ba986f156a8b67bf5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  originalMesh: {fileID: 999948662}
+  originalMesh: {fileID: 0}
   paintedMesh: {fileID: 1236342029}
   meshHold:
     _vertices:

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

     _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYEREDLIT_4_LAYER _LAYEREDLIT_4_LAYERS
     _LAYERMASKMAP _LAYER_MAPPING_PLANAR0 _LAYER_MAPPING_PLANAR_0 _LAYER_MAPPING_PLANAR_1
     _LAYER_MAPPING_PLANAR_2 _LAYER_MAPPING_PLANAR_3 _LAYER_MASK_VERTEX_COLOR _LAYER_MASK_VERTEX_COLOR_MUL
-    _NORMALMAP_TANGENT_SPACE
+    _NORMALMAP_TANGENT_SPACE _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2
+    _NORMALMAP_TANGENT_SPACE3
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_CustomRenderQueue: -1
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
-    - _HeightAmplitude0: 1
-    - _HeightAmplitude1: 1
-    - _HeightAmplitude2: 1
-    - _HeightAmplitude3: 1
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 0.01
+    - _HeightAmplitude3: 0.01
-    - _HeightCenter0: 0
-    - _HeightCenter1: 0
-    - _HeightCenter2: 0
-    - _HeightCenter3: 0
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0.5
+    - _HeightCenter3: 0.5
+    - _HeightCenterOffset0: 0
+    - _HeightFactor0: 1
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _HorizonFade: 1
     - _InheritBaseColor1: 0
     - _InheritBaseColor2: 0
     - _InheritBaseColor3: 0
     - _InheritBaseNormal1: 0
     - _InheritBaseNormal2: 0
     - _InheritBaseNormal3: 0
+    - _LayerCenterOffset0: 0.5
+    - _LayerCenterOffset1: 0.5
+    - _LayerCenterOffset2: 0.5
+    - _LayerCenterOffset3: 0.5
+    - _LayerHeightAmplitude0: 0.01
+    - _LayerHeightAmplitude1: 0.01
+    - _LayerHeightAmplitude2: 0.01
+    - _LayerHeightAmplitude3: 0.01
     - _LayerMapping0: 2
     - _LayerMapping1: 2
     - _LayerMapping2: 2
     - _LayerTiling1: 10
     - _LayerTiling2: 1
     - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
     - _MaterialId: 0
     - _Metalic: 0
     - _Metalic0: 0
     - _Metallic1: 0
     - _Metallic2: 0
     - _Metallic3: 0
+    - _MinimumOpacity0: 1
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _ObjectScaleAffectTile: 0
+    - _OpacityAsDensity0: 0
+    - _PPDLodThreshold: 5
     - _PPDMaxSamples: 15
     - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _TexWorldScale1: 1
     - _TexWorldScale2: 1
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
+    - _UseDensityMode: 0
+    - _UseMainLayerInfluence: 0
     - _VertexColorHeightFactor: 1
     - _VertexColorMode: 1
     - _ZTestMode: 8

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

     _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYEREDLIT_4_LAYER _LAYEREDLIT_4_LAYERS
     _LAYERMASKMAP _LAYERMASKVERTEXCOLOR_OFF _LAYER_MAPPING_PLANAR0 _LAYER_MAPPING_PLANAR_0
     _LAYER_MAPPING_PLANAR_1 _LAYER_MAPPING_PLANAR_2 _LAYER_MAPPING_PLANAR_3 _NORMALMAP_TANGENT_SPACE
+    _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2
+    _NORMALMAP_TANGENT_SPACE3
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_CustomRenderQueue: -1
     - _GlossMapScale: 1
     - _Glossiness: 0.5
     - _GlossyReflections: 1
-    - _HeightAmplitude0: 1
-    - _HeightAmplitude1: 1
-    - _HeightAmplitude2: 1
-    - _HeightAmplitude3: 1
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 0.01
+    - _HeightAmplitude3: 0.01
-    - _HeightCenter0: 0
-    - _HeightCenter1: 0
-    - _HeightCenter2: 0
-    - _HeightCenter3: 0
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0.5
+    - _HeightCenter3: 0.5
     - _HeightCenterOffset0: 0
     - _HeightCenterOffset1: 0
     - _HeightCenterOffset2: 0
     - _InheritBaseNormal1: 0
     - _InheritBaseNormal2: 0
     - _InheritBaseNormal3: 0
-    - _LayerCenterOffset0: 0
-    - _LayerCenterOffset1: 0
-    - _LayerCenterOffset2: 0
-    - _LayerCenterOffset3: 0
+    - _LayerCenterOffset0: 0.5
+    - _LayerCenterOffset1: 0.5
+    - _LayerCenterOffset2: 0.5
+    - _LayerCenterOffset3: 0.5
-    - _LayerHeightAmplitude0: 1
-    - _LayerHeightAmplitude1: 1
-    - _LayerHeightAmplitude2: 1
-    - _LayerHeightAmplitude3: 1
+    - _LayerHeightAmplitude0: 0.01
+    - _LayerHeightAmplitude1: 0.01
+    - _LayerHeightAmplitude2: 0.01
+    - _LayerHeightAmplitude3: 0.01
     - _LayerMapping0: 2
     - _LayerMapping1: 2
     - _LayerMapping2: 2
     - _LayerTiling1: 10
     - _LayerTiling2: 1
     - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
     - _MaterialId: 0
     - _Metalic: 0
     - _Metalic0: 0
     - _MinimumOpacity3: 1
     - _Mode: 0
     - _NormalMapSpace: 0
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _ObjectScaleAffectTile: 0
     - _OcclusionStrength: 1
     - _OpacityAsDensity0: 0
     - _OpacityAsDensity1: 0
     - _TexWorldScale1: 1
     - _TexWorldScale2: 1
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
     - _UVSec: 0
     - _UseDensityMode: 0
     - _UseHeightBasedBlend: 0

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

   m_Shader: {fileID: 4800000, guid: 81d02e8644315b742b154842a3a2f98c, type: 3}
   m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DEPTHOFFSETENABLE_OFF _DETAIL_MAP_WITH_NORMAL
     _DISTORTIONDEPTHTEST_OFF _DISTORTIONENABLE_OFF _DISTORTIONONLY_OFF _HEIGHTMAP
-    _HEIGHTMAP0 _HEIGHTMAP1 _HEIGHTMAP2 _HEIGHTMAP3 _HEIGHT_BASED_BLEND _LAYEREDLIT_4_LAYERS
-    _LAYERMASKVERTEXCOLOR_OFF _LAYER_MASK_VERTEX_COLOR_ADD _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
+    _HEIGHTMAP0 _HEIGHTMAP00 _HEIGHTMAP01 _HEIGHTMAP02 _HEIGHTMAP03 _HEIGHTMAP1 _HEIGHTMAP2
+    _HEIGHTMAP3 _LAYEREDLIT_4_LAYERS _LAYERMASKVERTEXCOLOR_OFF _LAYER_MASK_VERTEX_COLOR_MUL
+    _MASKMAP _MASKMAP0 _MASKMAP1 _MASKMAP2 _MASKMAP3 _NORMALMAP _NORMALMAP0 _NORMALMAP1
+    _NORMALMAP2 _NORMALMAP3 _NORMALMAP_TANGENT_SPACE _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1
+    _NORMALMAP_TANGENT_SPACE2 _NORMALMAP_TANGENT_SPACE3
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_CustomRenderQueue: -1
     - _MinimumOpacity3: 1
     - _Mode: 0
     - _NormalMapSpace: 0
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
     - _NormalScale0: 1
     - _NormalScale1: 1
     - _NormalScale2: 1
     - _TexWorldScale2: 0.1
     - _TexWorldScale3: 0.1
     - _TexWorldScaleBlendMask: 1
-    - _UVBase0: 4
+    - _UVBase0: 0
     - _UVBase1: 4
     - _UVBase2: 4
     - _UVBase3: 4
     - _UVDetail2: 0
     - _UVDetail3: 0
-    - _UVMappingPlanar0: 1
+    - _UVMappingPlanar0: 0
     - _UVMappingPlanar1: 1
     - _UVMappingPlanar2: 1
     - _UVMappingPlanar3: 1
-    - _UseHeightBasedBlend: 1
+    - _UseHeightBasedBlend: 0
-    - _VertexColorMode: 2
+    - _VertexColorMode: 1
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

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

   m_PrefabInternal: {fileID: 0}
   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_MASK_VERTEX_COLOR _LAYER_MASK_VERTEX_COLOR_MUL
-    _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP_WITH_NORMAL
+    _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MASK_VERTEX_COLOR
+    _LAYER_MASK_VERTEX_COLOR_MUL _NORMALMAP_TANGENT_SPACE _NORMALMAP_TANGENT_SPACE0
+    _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2 _NORMALMAP_TANGENT_SPACE3
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_CustomRenderQueue: -1
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap1:
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap2:
     - _LayerTiling1: 1
     - _LayerTiling2: 1
     - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
     - _Metallic: 0
     - _Metallic0: 0
     - _Metallic1: 0
     - _MinimumOpacity3: 1
     - _Mode: 0
     - _NormalMapSpace: 0
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _ObjectScaleAffectTile: 0
     - _OcclusionStrength: 1
     - _OpacityAsDensity0: 0
     - _OpacityAsDensity1: 0
     - _TexWorldScale1: 1
     - _TexWorldScale2: 1
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
     - _UVSec: 0
     - _UseDensityMode: 0
     - _UseHeightBasedBlend: 0
     - _UVDetailsMappingMask2: {r: 1, g: 0, b: 0, a: 0}
     - _UVDetailsMappingMask3: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
-    - _UVMappingMask0: {r: 0, g: 0, b: 0, a: 0}
+    - _UVMappingMask0: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask1: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask2: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask3: {r: 1, g: 0, b: 0, a: 0}

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer0_Triplanar
   m_Shader: {fileID: 4800000, guid: 81d02e8644315b742b154842a3a2f98c, type: 3}
-  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
-    _DISTORTIONONLY_OFF _DOUBLESIDED _EMISSION _EMISSIVE_COLOR _LAYER_MAPPING_TRIPLANAR_0
-    _LAYER_MASK_VERTEX_COLOR _LAYER_MASK_VERTEX_COLOR_MUL _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP_WITH_NORMAL
+    _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF _DOUBLESIDED _EMISSION _EMISSIVE_COLOR
+    _LAYER_MAPPING_TRIPLANAR0 _LAYER_MAPPING_TRIPLANAR_0 _LAYER_MASK_VERTEX_COLOR
+    _LAYER_MASK_VERTEX_COLOR_MUL _NORMALMAP_TANGENT_SPACE _NORMALMAP_TANGENT_SPACE0
+    _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2 _NORMALMAP_TANGENT_SPACE3
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_CustomRenderQueue: -1
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap1:
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap2:
     - _LayerTiling1: 1
     - _LayerTiling2: 1
     - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
     - _Metallic: 0
     - _Metallic0: 0
     - _Metallic1: 0
     - _MinimumOpacity3: 1
     - _Mode: 0
     - _NormalMapSpace: 0
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _ObjectScaleAffectTile: 0
     - _OcclusionStrength: 1
     - _OpacityAsDensity0: 0
     - _OpacityAsDensity1: 0
     - _TexWorldScale1: 1
     - _TexWorldScale2: 1
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
     - _UVSec: 0
     - _UseDensityMode: 0
     - _UseHeightBasedBlend: 0
     - _UVDetailsMappingMask2: {r: 1, g: 0, b: 0, a: 0}
     - _UVDetailsMappingMask3: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}
-    - _UVMappingMask0: {r: 0, g: 0, b: 0, a: 0}
+    - _UVMappingMask0: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask1: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask2: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask3: {r: 1, g: 0, b: 0, a: 0}

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

   m_PrefabInternal: {fileID: 0}
   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 _LAYER_MASK_VERTEX_COLOR_MUL
-    _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP_WITH_NORMAL
+    _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MASK_VERTEX_COLOR
+    _LAYER_MASK_VERTEX_COLOR_MUL _NORMALMAP_TANGENT_SPACE _NORMALMAP_TANGENT_SPACE0
+    _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2 _NORMALMAP_TANGENT_SPACE3
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_CustomRenderQueue: -1
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap1:
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap2:
     - _LayerTiling1: 1
     - _LayerTiling2: 1
     - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
     - _Metallic: 0
     - _Metallic0: 0
     - _Metallic1: 0
     - _MinimumOpacity3: 1
     - _Mode: 0
     - _NormalMapSpace: 0
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _ObjectScaleAffectTile: 0
     - _OcclusionStrength: 1
     - _OpacityAsDensity0: 0
     - _OpacityAsDensity1: 0
     - _TexWorldScale1: 1
     - _TexWorldScale2: 1
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
     - _UVSec: 0
     - _UseDensityMode: 0
     - _UseHeightBasedBlend: 0

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer1_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_1 _LAYER_MASK_VERTEX_COLOR
-    _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP_WITH_NORMAL
+    _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MAPPING_TRIPLANAR_1
+    _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1
+    _NORMALMAP_TANGENT_SPACE2 _NORMALMAP_TANGENT_SPACE3
+  m_EnableInstancingVariants: 0
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - DistortionVectors
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap1:
     - _BlendSize1: 0
     - _BlendSize2: 0
     - _BlendSize3: 0
+    - _BlendUsingHeight1: 0
+    - _BlendUsingHeight2: 0
+    - _BlendUsingHeight3: 0
     - _BumpScale: 1
     - _CullMode: 2
     - _Cutoff: 0.5
     - _DstBlend: 0
     - _EmissiveColorMode: 0
     - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 1
+    - _HeightAmplitude3: 1
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0
+    - _HeightCenter3: 0
+    - _HeightCenterOffset0: 0
+    - _HeightCenterOffset1: 0
+    - _HeightCenterOffset2: 0
+    - _HeightCenterOffset3: 0
+    - _HeightFactor0: 1
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _HorizonFade: 1
+    - _InheritBaseColor1: 0
+    - _InheritBaseColor2: 0
+    - _InheritBaseColor3: 0
+    - _InheritBaseColorThreshold1: 1
+    - _InheritBaseColorThreshold2: 1
+    - _InheritBaseColorThreshold3: 1
+    - _InheritBaseHeight1: 0
+    - _InheritBaseHeight2: 0
+    - _InheritBaseHeight3: 0
+    - _InheritBaseNormal1: 0
+    - _InheritBaseNormal2: 0
+    - _InheritBaseNormal3: 0
+    - _LayerCenterOffset0: 0.5
+    - _LayerCenterOffset1: 0.5
+    - _LayerCenterOffset2: 0
+    - _LayerCenterOffset3: 0
+    - _LayerHeightAmplitude0: 0.01
+    - _LayerHeightAmplitude1: 0.01
+    - _LayerHeightAmplitude2: 1
+    - _LayerHeightAmplitude3: 1
+    - _LayerTiling0: 1
+    - _LayerTiling1: 1
+    - _LayerTiling2: 1
+    - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
+    - _MinimumOpacity0: 1
+    - _MinimumOpacity1: 1
+    - _MinimumOpacity2: 1
+    - _MinimumOpacity3: 1
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
+    - _ObjectScaleAffectTile: 0
+    - _OpacityAsDensity0: 0
+    - _OpacityAsDensity1: 0
+    - _OpacityAsDensity2: 0
+    - _OpacityAsDensity3: 0
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _Smoothness1: 0.5
     - _TexWorldScale1: 0.2
     - _TexWorldScale2: 1
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVDetailsMappingMask2: 0
     - _UVDetailsMappingMask3: 0
     - _UVMappingPlanar0: 0
-    - _UVMappingPlanar1: 0
+    - _UVMappingPlanar1: 1
+    - _UVMappingPlanarBlendMask: 0
+    - _UseDensityMode: 0
+    - _UseHeightBasedBlend: 0
+    - _UseMainLayerInfluence: 0
+    - _VertexColorMode: 0
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_Planar.mat.meta

 timeCreated: 1481879952
 licenseType: Pro
 NativeFormatImporter:
+  mainObjectFileID: -1
   userData: '{"GUIDArray":["686eb5593c0e94f4eb86ca1d3cfef7fa","609b27a9e3e537048b26ff65f31946e8","",""]}'
   assetBundleName: 
   assetBundleVariant: 

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer1_Triplanar
   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_1 _LAYER_MASK_VERTEX_COLOR
-    _NORMALMAP_TANGENT_SPACE _REQUIRE_UV3
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP_WITH_NORMAL
+    _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF _DOUBLESIDED _EMISSION _EMISSIVE_COLOR
+    _LAYER_MAPPING_TRIPLANAR1 _LAYER_MAPPING_TRIPLANAR_1 _LAYER_MASK_VERTEX_COLOR
+    _NORMALMAP_TANGENT_SPACE _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2
+    _NORMALMAP_TANGENT_SPACE3
+  m_EnableInstancingVariants: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses:
     m_TexEnvs:
     - _BaseColorMap0:
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap1:
     - _BlendSize1: 0
     - _BlendSize2: 0
     - _BlendSize3: 0
+    - _BlendUsingHeight1: 0
+    - _BlendUsingHeight2: 0
+    - _BlendUsingHeight3: 0
     - _BumpScale: 1
     - _CullMode: 0
     - _Cutoff: 0.5
     - _DstBlend: 0
     - _EmissiveColorMode: 0
     - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 1
+    - _HeightAmplitude3: 1
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0
+    - _HeightCenter3: 0
+    - _HeightCenterOffset0: 0
+    - _HeightCenterOffset1: 0
+    - _HeightCenterOffset2: 0
+    - _HeightCenterOffset3: 0
+    - _HeightFactor0: 1
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _HorizonFade: 1
+    - _InheritBaseColor1: 0
+    - _InheritBaseColor2: 0
+    - _InheritBaseColor3: 0
+    - _InheritBaseColorThreshold1: 1
+    - _InheritBaseColorThreshold2: 1
+    - _InheritBaseColorThreshold3: 1
+    - _InheritBaseHeight1: 0
+    - _InheritBaseHeight2: 0
+    - _InheritBaseHeight3: 0
+    - _InheritBaseNormal1: 0
+    - _InheritBaseNormal2: 0
+    - _InheritBaseNormal3: 0
+    - _LayerCenterOffset0: 0.5
+    - _LayerCenterOffset1: 0.5
+    - _LayerCenterOffset2: 0
+    - _LayerCenterOffset3: 0
+    - _LayerHeightAmplitude0: 0.01
+    - _LayerHeightAmplitude1: 0.01
+    - _LayerHeightAmplitude2: 1
+    - _LayerHeightAmplitude3: 1
+    - _LayerTiling0: 1
+    - _LayerTiling1: 1
+    - _LayerTiling2: 1
+    - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
+    - _MinimumOpacity0: 1
+    - _MinimumOpacity1: 1
+    - _MinimumOpacity2: 1
+    - _MinimumOpacity3: 1
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
+    - _ObjectScaleAffectTile: 0
+    - _OpacityAsDensity0: 0
+    - _OpacityAsDensity1: 0
+    - _OpacityAsDensity2: 0
+    - _OpacityAsDensity3: 0
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _Smoothness1: 0.5
     - _TexWorldScale1: 0.2
     - _TexWorldScale2: 1
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
+    - _UseDensityMode: 0
+    - _UseHeightBasedBlend: 0
+    - _UseMainLayerInfluence: 0
+    - _VertexColorMode: 0
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_Triplanar.mat.meta

 timeCreated: 1481881644
 licenseType: Pro
 NativeFormatImporter:
+  mainObjectFileID: -1
   userData: '{"GUIDArray":["686eb5593c0e94f4eb86ca1d3cfef7fa","609b27a9e3e537048b26ff65f31946e8","",""]}'
   assetBundleName: 
   assetBundleVariant: 

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer1_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
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP_WITH_NORMAL
+    _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MASK_VERTEX_COLOR
+    _NORMALMAP_TANGENT_SPACE _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2
+    _NORMALMAP_TANGENT_SPACE3
   m_LightmapFlags: 1
   m_EnableInstancingVariants: 0
   m_CustomRenderQueue: -1
     serializedVersion: 3
     m_TexEnvs:
     - _BaseColorMap0:
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap1:
     - _LayerTiling1: 1
     - _LayerTiling2: 1
     - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
     - _Metallic: 0
     - _Metallic0: 0
     - _Metallic1: 0
     - _MinimumOpacity3: 1
     - _Mode: 0
     - _NormalMapSpace: 0
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _ObjectScaleAffectTile: 0
     - _OcclusionStrength: 1
     - _OpacityAsDensity0: 0
     - _OpacityAsDensity1: 0
     - _TexWorldScale1: 1
     - _TexWorldScale2: 1
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
     - _UVSec: 0
     - _UseDensityMode: 0
     - _UseHeightBasedBlend: 0

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer1_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
-    _REQUIRE_UV3
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP_WITH_NORMAL
+    _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MASK_VERTEX_COLOR
+    _NORMALMAP_TANGENT_SPACE _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2
+    _NORMALMAP_TANGENT_SPACE3
+  m_EnableInstancingVariants: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses:
     m_TexEnvs:
     - _BaseColorMap0:
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap1:
     - _BlendSize1: 0
     - _BlendSize2: 0
     - _BlendSize3: 0
+    - _BlendUsingHeight1: 0
+    - _BlendUsingHeight2: 0
+    - _BlendUsingHeight3: 0
     - _BumpScale: 1
     - _CullMode: 2
     - _Cutoff: 0.5
     - _DstBlend: 0
     - _EmissiveColorMode: 0
     - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 1
+    - _HeightAmplitude3: 1
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0
+    - _HeightCenter3: 0
+    - _HeightCenterOffset0: 0
+    - _HeightCenterOffset1: 0
+    - _HeightCenterOffset2: 0
+    - _HeightCenterOffset3: 0
+    - _HeightFactor0: 1
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _HorizonFade: 1
+    - _InheritBaseColor1: 0
+    - _InheritBaseColor2: 0
+    - _InheritBaseColor3: 0
+    - _InheritBaseColorThreshold1: 1
+    - _InheritBaseColorThreshold2: 1
+    - _InheritBaseColorThreshold3: 1
+    - _InheritBaseHeight1: 0
+    - _InheritBaseHeight2: 0
+    - _InheritBaseHeight3: 0
+    - _InheritBaseNormal1: 0
+    - _InheritBaseNormal2: 0
+    - _InheritBaseNormal3: 0
+    - _LayerCenterOffset0: 0.5
+    - _LayerCenterOffset1: 0.5
+    - _LayerCenterOffset2: 0
+    - _LayerCenterOffset3: 0
+    - _LayerHeightAmplitude0: 0.01
+    - _LayerHeightAmplitude1: 0.01
+    - _LayerHeightAmplitude2: 1
+    - _LayerHeightAmplitude3: 1
+    - _LayerTiling0: 1
+    - _LayerTiling1: 1
+    - _LayerTiling2: 1
+    - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
+    - _MinimumOpacity0: 1
+    - _MinimumOpacity1: 1
+    - _MinimumOpacity2: 1
+    - _MinimumOpacity3: 1
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
+    - _ObjectScaleAffectTile: 0
+    - _OpacityAsDensity0: 0
+    - _OpacityAsDensity1: 0
+    - _OpacityAsDensity2: 0
+    - _OpacityAsDensity3: 0
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _Smoothness1: 0.5
     - _TexWorldScale1: 1
     - _TexWorldScale2: 1
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 1
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
+    - _UseDensityMode: 0
+    - _UseHeightBasedBlend: 0
+    - _UseMainLayerInfluence: 0
+    - _VertexColorMode: 0
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_UV1.mat.meta

 timeCreated: 1480680792
 licenseType: Pro
 NativeFormatImporter:
+  mainObjectFileID: -1
   userData: '{"GUIDArray":["686eb5593c0e94f4eb86ca1d3cfef7fa","609b27a9e3e537048b26ff65f31946e8","",""]}'
   assetBundleName: 
   assetBundleVariant: 

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer1_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
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP_WITH_NORMAL
+    _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MASK_VERTEX_COLOR
+    _NORMALMAP_TANGENT_SPACE _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2
+    _NORMALMAP_TANGENT_SPACE3 _REQUIRE_UV2 _REQUIRE_UV2_OR_UV3
+  m_EnableInstancingVariants: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses:
     m_TexEnvs:
     - _BaseColorMap0:
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap1:
     - _BlendSize1: 0
     - _BlendSize2: 0
     - _BlendSize3: 0
+    - _BlendUsingHeight1: 0
+    - _BlendUsingHeight2: 0
+    - _BlendUsingHeight3: 0
     - _BumpScale: 1
     - _CullMode: 2
     - _Cutoff: 0.5
     - _DstBlend: 0
     - _EmissiveColorMode: 0
     - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 1
+    - _HeightAmplitude3: 1
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0
+    - _HeightCenter3: 0
+    - _HeightCenterOffset0: 0
+    - _HeightCenterOffset1: 0
+    - _HeightCenterOffset2: 0
+    - _HeightCenterOffset3: 0
+    - _HeightFactor0: 1
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _HorizonFade: 1
+    - _InheritBaseColor1: 0
+    - _InheritBaseColor2: 0
+    - _InheritBaseColor3: 0
+    - _InheritBaseColorThreshold1: 1
+    - _InheritBaseColorThreshold2: 1
+    - _InheritBaseColorThreshold3: 1
+    - _InheritBaseHeight1: 0
+    - _InheritBaseHeight2: 0
+    - _InheritBaseHeight3: 0
+    - _InheritBaseNormal1: 0
+    - _InheritBaseNormal2: 0
+    - _InheritBaseNormal3: 0
+    - _LayerCenterOffset0: 0.5
+    - _LayerCenterOffset1: 0.5
+    - _LayerCenterOffset2: 0
+    - _LayerCenterOffset3: 0
+    - _LayerHeightAmplitude0: 0.01
+    - _LayerHeightAmplitude1: 0.01
+    - _LayerHeightAmplitude2: 1
+    - _LayerHeightAmplitude3: 1
+    - _LayerTiling0: 1
+    - _LayerTiling1: 1
+    - _LayerTiling2: 1
+    - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
+    - _MinimumOpacity0: 1
+    - _MinimumOpacity1: 1
+    - _MinimumOpacity2: 1
+    - _MinimumOpacity3: 1
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
+    - _ObjectScaleAffectTile: 0
+    - _OpacityAsDensity0: 0
+    - _OpacityAsDensity1: 0
+    - _OpacityAsDensity2: 0
+    - _OpacityAsDensity3: 0
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _Smoothness1: 0.5
     - _TexWorldScale1: 1
     - _TexWorldScale2: 1
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 2
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
+    - _UseDensityMode: 0
+    - _UseHeightBasedBlend: 0
+    - _UseMainLayerInfluence: 0
+    - _VertexColorMode: 0
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_UV2.mat.meta

 timeCreated: 1481881764
 licenseType: Pro
 NativeFormatImporter:
+  mainObjectFileID: -1
   userData: '{"GUIDArray":["686eb5593c0e94f4eb86ca1d3cfef7fa","609b27a9e3e537048b26ff65f31946e8","",""]}'
   assetBundleName: 
   assetBundleVariant: 

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer1_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
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP_WITH_NORMAL
+    _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MASK_VERTEX_COLOR
+    _NORMALMAP_TANGENT_SPACE _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2
+    _NORMALMAP_TANGENT_SPACE3 _REQUIRE_UV2_OR_UV3 _REQUIRE_UV3
+  m_EnableInstancingVariants: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses:
     m_TexEnvs:
     - _BaseColorMap0:
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap1:
     - _BlendSize1: 0
     - _BlendSize2: 0
     - _BlendSize3: 0
+    - _BlendUsingHeight1: 0
+    - _BlendUsingHeight2: 0
+    - _BlendUsingHeight3: 0
     - _BumpScale: 1
     - _CullMode: 2
     - _Cutoff: 0.5
     - _DstBlend: 0
     - _EmissiveColorMode: 0
     - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 1
+    - _HeightAmplitude3: 1
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0
+    - _HeightCenter3: 0
+    - _HeightCenterOffset0: 0
+    - _HeightCenterOffset1: 0
+    - _HeightCenterOffset2: 0
+    - _HeightCenterOffset3: 0
+    - _HeightFactor0: 1
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _HorizonFade: 1
+    - _InheritBaseColor1: 0
+    - _InheritBaseColor2: 0
+    - _InheritBaseColor3: 0
+    - _InheritBaseColorThreshold1: 1
+    - _InheritBaseColorThreshold2: 1
+    - _InheritBaseColorThreshold3: 1
+    - _InheritBaseHeight1: 0
+    - _InheritBaseHeight2: 0
+    - _InheritBaseHeight3: 0
+    - _InheritBaseNormal1: 0
+    - _InheritBaseNormal2: 0
+    - _InheritBaseNormal3: 0
+    - _LayerCenterOffset0: 0.5
+    - _LayerCenterOffset1: 0.5
+    - _LayerCenterOffset2: 0
+    - _LayerCenterOffset3: 0
+    - _LayerHeightAmplitude0: 0.01
+    - _LayerHeightAmplitude1: 0.01
+    - _LayerHeightAmplitude2: 1
+    - _LayerHeightAmplitude3: 1
+    - _LayerTiling0: 1
+    - _LayerTiling1: 1
+    - _LayerTiling2: 1
+    - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
+    - _MinimumOpacity0: 1
+    - _MinimumOpacity1: 1
+    - _MinimumOpacity2: 1
+    - _MinimumOpacity3: 1
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
+    - _ObjectScaleAffectTile: 0
+    - _OpacityAsDensity0: 0
+    - _OpacityAsDensity1: 0
+    - _OpacityAsDensity2: 0
+    - _OpacityAsDensity3: 0
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _Smoothness1: 0.5
     - _TexWorldScale1: 1
     - _TexWorldScale2: 1
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 3
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
+    - _UseDensityMode: 0
+    - _UseHeightBasedBlend: 0
+    - _UseMainLayerInfluence: 0
+    - _VertexColorMode: 0
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer1_UV3.mat.meta

 timeCreated: 1481881398
 licenseType: Pro
 NativeFormatImporter:
+  mainObjectFileID: -1
   userData: '{"GUIDArray":["686eb5593c0e94f4eb86ca1d3cfef7fa","609b27a9e3e537048b26ff65f31946e8","",""]}'
   assetBundleName: 
   assetBundleVariant: 

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer2_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 _LAYEREDLIT_3_LAYERS _LAYER_MAPPING_TRIPLANAR_2
-    _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP2
+    _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF _EMISSION
+    _EMISSIVE_COLOR _LAYEREDLIT_3_LAYERS _LAYER_MAPPING_TRIPLANAR_2 _LAYER_MASK_VERTEX_COLOR
+    _NORMALMAP_TANGENT_SPACE _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2
+    _NORMALMAP_TANGENT_SPACE3
+  m_EnableInstancingVariants: 0
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - DistortionVectors
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap2:
     - _BlendSize1: 0
     - _BlendSize2: 0
     - _BlendSize3: 0
+    - _BlendUsingHeight1: 0
+    - _BlendUsingHeight2: 0
+    - _BlendUsingHeight3: 0
     - _BumpScale: 1
     - _CullMode: 2
     - _Cutoff: 0.5
     - _DstBlend: 0
     - _EmissiveColorMode: 0
     - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 0.01
+    - _HeightAmplitude3: 1
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0.5
+    - _HeightCenter3: 0
+    - _HeightCenterOffset0: 0
+    - _HeightCenterOffset1: 0
+    - _HeightCenterOffset2: 0
+    - _HeightCenterOffset3: 0
+    - _HeightFactor0: 1
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _HorizonFade: 1
+    - _InheritBaseColor1: 0
+    - _InheritBaseColor2: 0
+    - _InheritBaseColor3: 0
+    - _InheritBaseColorThreshold1: 1
+    - _InheritBaseColorThreshold2: 1
+    - _InheritBaseColorThreshold3: 1
+    - _InheritBaseHeight1: 0
+    - _InheritBaseHeight2: 0
+    - _InheritBaseHeight3: 0
+    - _InheritBaseNormal1: 0
+    - _InheritBaseNormal2: 0
+    - _InheritBaseNormal3: 0
+    - _LayerCenterOffset0: 0.5
+    - _LayerCenterOffset1: 0.5
+    - _LayerCenterOffset2: 0.5
+    - _LayerCenterOffset3: 0
+    - _LayerHeightAmplitude0: 0.01
+    - _LayerHeightAmplitude1: 0.01
+    - _LayerHeightAmplitude2: 0.01
+    - _LayerHeightAmplitude3: 1
+    - _LayerTiling0: 1
+    - _LayerTiling1: 1
+    - _LayerTiling2: 1
+    - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
+    - _MinimumOpacity0: 1
+    - _MinimumOpacity1: 1
+    - _MinimumOpacity2: 1
+    - _MinimumOpacity3: 1
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
+    - _ObjectScaleAffectTile: 0
+    - _OpacityAsDensity0: 0
+    - _OpacityAsDensity1: 0
+    - _OpacityAsDensity2: 0
+    - _OpacityAsDensity3: 0
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _Smoothness1: 0.5
     - _TexWorldScale1: 1
     - _TexWorldScale2: 0.2
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVDetailsMappingMask3: 0
     - _UVMappingPlanar0: 0
     - _UVMappingPlanar1: 0
-    - _UVMappingPlanar2: 0
+    - _UVMappingPlanar2: 1
+    - _UVMappingPlanarBlendMask: 0
+    - _UseDensityMode: 0
+    - _UseHeightBasedBlend: 0
+    - _UseMainLayerInfluence: 0
+    - _VertexColorMode: 0
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer2_Planar.mat.meta

 timeCreated: 1481879997
 licenseType: Pro
 NativeFormatImporter:
+  mainObjectFileID: -1
   userData: '{"GUIDArray":["686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","b1bac0266a49a1040a9365f40c7b6ddd",""]}'
   assetBundleName: 
   assetBundleVariant: 

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer2_Triplanar
   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 _LAYEREDLIT_3_LAYERS _LAYER_MAPPING_TRIPLANAR_2
-    _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE _REQUIRE_UV3
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP2
+    _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF _DOUBLESIDED
+    _EMISSION _EMISSIVE_COLOR _LAYEREDLIT_3_LAYERS _LAYER_MAPPING_TRIPLANAR2 _LAYER_MAPPING_TRIPLANAR_2
+    _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1
+    _NORMALMAP_TANGENT_SPACE2 _NORMALMAP_TANGENT_SPACE3
+  m_EnableInstancingVariants: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses:
     m_TexEnvs:
     - _BaseColorMap0:
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap2:
     - _BlendSize1: 0
     - _BlendSize2: 0
     - _BlendSize3: 0
+    - _BlendUsingHeight1: 0
+    - _BlendUsingHeight2: 0
+    - _BlendUsingHeight3: 0
     - _BumpScale: 1
     - _CullMode: 0
     - _Cutoff: 0.5
     - _DstBlend: 0
     - _EmissiveColorMode: 0
     - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 0.01
+    - _HeightAmplitude3: 1
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0.5
+    - _HeightCenter3: 0
+    - _HeightCenterOffset0: 0
+    - _HeightCenterOffset1: 0
+    - _HeightCenterOffset2: 0
+    - _HeightCenterOffset3: 0
+    - _HeightFactor0: 1
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _HorizonFade: 1
+    - _InheritBaseColor1: 0
+    - _InheritBaseColor2: 0
+    - _InheritBaseColor3: 0
+    - _InheritBaseColorThreshold1: 1
+    - _InheritBaseColorThreshold2: 1
+    - _InheritBaseColorThreshold3: 1
+    - _InheritBaseHeight1: 0
+    - _InheritBaseHeight2: 0
+    - _InheritBaseHeight3: 0
+    - _InheritBaseNormal1: 0
+    - _InheritBaseNormal2: 0
+    - _InheritBaseNormal3: 0
+    - _LayerCenterOffset0: 0.5
+    - _LayerCenterOffset1: 0.5
+    - _LayerCenterOffset2: 0.5
+    - _LayerCenterOffset3: 0
+    - _LayerHeightAmplitude0: 0.01
+    - _LayerHeightAmplitude1: 0.01
+    - _LayerHeightAmplitude2: 0.01
+    - _LayerHeightAmplitude3: 1
+    - _LayerTiling0: 1
+    - _LayerTiling1: 1
+    - _LayerTiling2: 1
+    - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
+    - _MinimumOpacity0: 1
+    - _MinimumOpacity1: 1
+    - _MinimumOpacity2: 1
+    - _MinimumOpacity3: 1
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
+    - _ObjectScaleAffectTile: 0
+    - _OpacityAsDensity0: 0
+    - _OpacityAsDensity1: 0
+    - _OpacityAsDensity2: 0
+    - _OpacityAsDensity3: 0
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _Smoothness1: 0.5
     - _TexWorldScale1: 1
     - _TexWorldScale2: 0.2
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
+    - _UseDensityMode: 0
+    - _UseHeightBasedBlend: 0
+    - _UseMainLayerInfluence: 0
+    - _VertexColorMode: 0
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer2_Triplanar.mat.meta

 timeCreated: 1481881627
 licenseType: Pro
 NativeFormatImporter:
+  mainObjectFileID: -1
   userData: '{"GUIDArray":["686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","b1bac0266a49a1040a9365f40c7b6ddd",""]}'
   assetBundleName: 
   assetBundleVariant: 

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer2_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 _LAYEREDLIT_3_LAYERS _LAYER_MASK_VERTEX_COLOR
-    _NORMALMAP_TANGENT_SPACE _REQUIRE_UV3
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP2
+    _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF _EMISSION
+    _EMISSIVE_COLOR _LAYEREDLIT_3_LAYERS _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
+    _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2
+    _NORMALMAP_TANGENT_SPACE3
+  m_EnableInstancingVariants: 0
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - DistortionVectors
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap2:
     - _BlendSize1: 0
     - _BlendSize2: 0
     - _BlendSize3: 0
+    - _BlendUsingHeight1: 0
+    - _BlendUsingHeight2: 0
+    - _BlendUsingHeight3: 0
     - _BumpScale: 1
     - _CullMode: 2
     - _Cutoff: 0.5
     - _DstBlend: 0
     - _EmissiveColorMode: 0
     - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 0.01
+    - _HeightAmplitude3: 1
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0.5
+    - _HeightCenter3: 0
+    - _HeightCenterOffset0: 0
+    - _HeightCenterOffset1: 0
+    - _HeightCenterOffset2: 0
+    - _HeightCenterOffset3: 0
+    - _HeightFactor0: 1
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _HorizonFade: 1
+    - _InheritBaseColor1: 0
+    - _InheritBaseColor2: 0
+    - _InheritBaseColor3: 0
+    - _InheritBaseColorThreshold1: 1
+    - _InheritBaseColorThreshold2: 1
+    - _InheritBaseColorThreshold3: 1
+    - _InheritBaseHeight1: 0
+    - _InheritBaseHeight2: 0
+    - _InheritBaseHeight3: 0
+    - _InheritBaseNormal1: 0
+    - _InheritBaseNormal2: 0
+    - _InheritBaseNormal3: 0
+    - _LayerCenterOffset0: 0.5
+    - _LayerCenterOffset1: 0.5
+    - _LayerCenterOffset2: 0.5
+    - _LayerCenterOffset3: 0
+    - _LayerHeightAmplitude0: 0.01
+    - _LayerHeightAmplitude1: 0.01
+    - _LayerHeightAmplitude2: 0.01
+    - _LayerHeightAmplitude3: 1
+    - _LayerTiling0: 1
+    - _LayerTiling1: 1
+    - _LayerTiling2: 1
+    - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
+    - _MinimumOpacity0: 1
+    - _MinimumOpacity1: 1
+    - _MinimumOpacity2: 1
+    - _MinimumOpacity3: 1
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
+    - _ObjectScaleAffectTile: 0
+    - _OpacityAsDensity0: 0
+    - _OpacityAsDensity1: 0
+    - _OpacityAsDensity2: 0
+    - _OpacityAsDensity3: 0
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _Smoothness1: 0.5
     - _TexWorldScale1: 1
     - _TexWorldScale2: 1
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
+    - _UseDensityMode: 0
+    - _UseHeightBasedBlend: 0
+    - _UseMainLayerInfluence: 0
+    - _VertexColorMode: 0
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer2_UV0.mat.meta

 timeCreated: 1480680957
 licenseType: Pro
 NativeFormatImporter:
+  mainObjectFileID: -1
   userData: '{"GUIDArray":["686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","b1bac0266a49a1040a9365f40c7b6ddd",""]}'
   assetBundleName: 
   assetBundleVariant: 

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer2_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 _LAYEREDLIT_3_LAYERS _LAYER_MASK_VERTEX_COLOR
-    _NORMALMAP_TANGENT_SPACE _REQUIRE_UV3
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP2
+    _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF _EMISSION
+    _EMISSIVE_COLOR _LAYEREDLIT_3_LAYERS _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
+    _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2
+    _NORMALMAP_TANGENT_SPACE3
+  m_EnableInstancingVariants: 0
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - DistortionVectors
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap2:
     - _BlendSize1: 0
     - _BlendSize2: 0
     - _BlendSize3: 0
+    - _BlendUsingHeight1: 0
+    - _BlendUsingHeight2: 0
+    - _BlendUsingHeight3: 0
     - _BumpScale: 1
     - _CullMode: 2
     - _Cutoff: 0.5
     - _DstBlend: 0
     - _EmissiveColorMode: 0
     - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 0.01
+    - _HeightAmplitude3: 1
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0.5
+    - _HeightCenter3: 0
+    - _HeightCenterOffset0: 0
+    - _HeightCenterOffset1: 0
+    - _HeightCenterOffset2: 0
+    - _HeightCenterOffset3: 0
+    - _HeightFactor0: 1
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _HorizonFade: 1
+    - _InheritBaseColor1: 0
+    - _InheritBaseColor2: 0
+    - _InheritBaseColor3: 0
+    - _InheritBaseColorThreshold1: 1
+    - _InheritBaseColorThreshold2: 1
+    - _InheritBaseColorThreshold3: 1
+    - _InheritBaseHeight1: 0
+    - _InheritBaseHeight2: 0
+    - _InheritBaseHeight3: 0
+    - _InheritBaseNormal1: 0
+    - _InheritBaseNormal2: 0
+    - _InheritBaseNormal3: 0
+    - _LayerCenterOffset0: 0.5
+    - _LayerCenterOffset1: 0.5
+    - _LayerCenterOffset2: 0.5
+    - _LayerCenterOffset3: 0
+    - _LayerHeightAmplitude0: 0.01
+    - _LayerHeightAmplitude1: 0.01
+    - _LayerHeightAmplitude2: 0.01
+    - _LayerHeightAmplitude3: 1
+    - _LayerTiling0: 1
+    - _LayerTiling1: 1
+    - _LayerTiling2: 1
+    - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
+    - _MinimumOpacity0: 1
+    - _MinimumOpacity1: 1
+    - _MinimumOpacity2: 1
+    - _MinimumOpacity3: 1
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
+    - _ObjectScaleAffectTile: 0
+    - _OpacityAsDensity0: 0
+    - _OpacityAsDensity1: 0
+    - _OpacityAsDensity2: 0
+    - _OpacityAsDensity3: 0
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _Smoothness1: 0.5
     - _TexWorldScale1: 1
     - _TexWorldScale2: 1
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
+    - _UseDensityMode: 0
+    - _UseHeightBasedBlend: 0
+    - _UseMainLayerInfluence: 0
+    - _VertexColorMode: 0
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer2_UV1.mat.meta

 timeCreated: 1480680976
 licenseType: Pro
 NativeFormatImporter:
+  mainObjectFileID: -1
   userData: '{"GUIDArray":["686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","b1bac0266a49a1040a9365f40c7b6ddd",""]}'
   assetBundleName: 
   assetBundleVariant: 

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer2_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 _LAYEREDLIT_3_LAYERS _LAYER_MASK_VERTEX_COLOR
-    _NORMALMAP_TANGENT_SPACE _REQUIRE_UV2_OR_UV3 _REQUIRE_UV3
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP2
+    _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF _EMISSION
+    _EMISSIVE_COLOR _LAYEREDLIT_3_LAYERS _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
+    _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2
+    _NORMALMAP_TANGENT_SPACE3 _REQUIRE_UV2 _REQUIRE_UV2_OR_UV3
+  m_EnableInstancingVariants: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses:
     m_TexEnvs:
     - _BaseColorMap0:
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap2:
     - _BlendSize1: 0
     - _BlendSize2: 0
     - _BlendSize3: 0
+    - _BlendUsingHeight1: 0
+    - _BlendUsingHeight2: 0
+    - _BlendUsingHeight3: 0
     - _BumpScale: 1
     - _CullMode: 2
     - _Cutoff: 0.5
     - _DstBlend: 0
     - _EmissiveColorMode: 0
     - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 0.01
+    - _HeightAmplitude3: 1
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0.5
+    - _HeightCenter3: 0
+    - _HeightCenterOffset0: 0
+    - _HeightCenterOffset1: 0
+    - _HeightCenterOffset2: 0
+    - _HeightCenterOffset3: 0
+    - _HeightFactor0: 1
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _HorizonFade: 1
+    - _InheritBaseColor1: 0
+    - _InheritBaseColor2: 0
+    - _InheritBaseColor3: 0
+    - _InheritBaseColorThreshold1: 1
+    - _InheritBaseColorThreshold2: 1
+    - _InheritBaseColorThreshold3: 1
+    - _InheritBaseHeight1: 0
+    - _InheritBaseHeight2: 0
+    - _InheritBaseHeight3: 0
+    - _InheritBaseNormal1: 0
+    - _InheritBaseNormal2: 0
+    - _InheritBaseNormal3: 0
+    - _LayerCenterOffset0: 0.5
+    - _LayerCenterOffset1: 0.5
+    - _LayerCenterOffset2: 0.5
+    - _LayerCenterOffset3: 0
+    - _LayerHeightAmplitude0: 0.01
+    - _LayerHeightAmplitude1: 0.01
+    - _LayerHeightAmplitude2: 0.01
+    - _LayerHeightAmplitude3: 1
+    - _LayerTiling0: 1
+    - _LayerTiling1: 1
+    - _LayerTiling2: 1
+    - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
+    - _MinimumOpacity0: 1
+    - _MinimumOpacity1: 1
+    - _MinimumOpacity2: 1
+    - _MinimumOpacity3: 1
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
+    - _ObjectScaleAffectTile: 0
+    - _OpacityAsDensity0: 0
+    - _OpacityAsDensity1: 0
+    - _OpacityAsDensity2: 0
+    - _OpacityAsDensity3: 0
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _Smoothness1: 0.5
     - _TexWorldScale1: 1
     - _TexWorldScale2: 1
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
+    - _UseDensityMode: 0
+    - _UseHeightBasedBlend: 0
+    - _UseMainLayerInfluence: 0
+    - _VertexColorMode: 0
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer2_UV2.mat.meta

 timeCreated: 1481881780
 licenseType: Pro
 NativeFormatImporter:
+  mainObjectFileID: -1
   userData: '{"GUIDArray":["686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","b1bac0266a49a1040a9365f40c7b6ddd",""]}'
   assetBundleName: 
   assetBundleVariant: 

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer2_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 _LAYEREDLIT_3_LAYERS _LAYER_MASK_VERTEX_COLOR
-    _NORMALMAP_TANGENT_SPACE _REQUIRE_UV2_OR_UV3 _REQUIRE_UV3
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP2
+    _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF _EMISSION
+    _EMISSIVE_COLOR _LAYEREDLIT_3_LAYERS _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
+    _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2
+    _NORMALMAP_TANGENT_SPACE3 _REQUIRE_UV2_OR_UV3 _REQUIRE_UV3
+  m_EnableInstancingVariants: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses:
     m_TexEnvs:
     - _BaseColorMap0:
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap2:
     - _BlendSize1: 0
     - _BlendSize2: 0
     - _BlendSize3: 0
+    - _BlendUsingHeight1: 0
+    - _BlendUsingHeight2: 0
+    - _BlendUsingHeight3: 0
     - _BumpScale: 1
     - _CullMode: 2
     - _Cutoff: 0.5
     - _DstBlend: 0
     - _EmissiveColorMode: 0
     - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 0.01
+    - _HeightAmplitude3: 1
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0.5
+    - _HeightCenter3: 0
+    - _HeightCenterOffset0: 0
+    - _HeightCenterOffset1: 0
+    - _HeightCenterOffset2: 0
+    - _HeightCenterOffset3: 0
+    - _HeightFactor0: 1
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _HorizonFade: 1
+    - _InheritBaseColor1: 0
+    - _InheritBaseColor2: 0
+    - _InheritBaseColor3: 0
+    - _InheritBaseColorThreshold1: 1
+    - _InheritBaseColorThreshold2: 1
+    - _InheritBaseColorThreshold3: 1
+    - _InheritBaseHeight1: 0
+    - _InheritBaseHeight2: 0
+    - _InheritBaseHeight3: 0
+    - _InheritBaseNormal1: 0
+    - _InheritBaseNormal2: 0
+    - _InheritBaseNormal3: 0
+    - _LayerCenterOffset0: 0.5
+    - _LayerCenterOffset1: 0.5
+    - _LayerCenterOffset2: 0.5
+    - _LayerCenterOffset3: 0
+    - _LayerHeightAmplitude0: 0.01
+    - _LayerHeightAmplitude1: 0.01
+    - _LayerHeightAmplitude2: 0.01
+    - _LayerHeightAmplitude3: 1
+    - _LayerTiling0: 1
+    - _LayerTiling1: 1
+    - _LayerTiling2: 1
+    - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
+    - _MinimumOpacity0: 1
+    - _MinimumOpacity1: 1
+    - _MinimumOpacity2: 1
+    - _MinimumOpacity3: 1
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
+    - _ObjectScaleAffectTile: 0
+    - _OpacityAsDensity0: 0
+    - _OpacityAsDensity1: 0
+    - _OpacityAsDensity2: 0
+    - _OpacityAsDensity3: 0
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _Smoothness1: 0.5
     - _TexWorldScale1: 1
     - _TexWorldScale2: 1
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
+    - _UseDensityMode: 0
+    - _UseHeightBasedBlend: 0
+    - _UseMainLayerInfluence: 0
+    - _VertexColorMode: 0
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer2_UV3.mat.meta

 timeCreated: 1481881437
 licenseType: Pro
 NativeFormatImporter:
+  mainObjectFileID: -1
   userData: '{"GUIDArray":["686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","b1bac0266a49a1040a9365f40c7b6ddd",""]}'
   assetBundleName: 
   assetBundleVariant: 

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer3_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 _LAYEREDLIT_4_LAYERS _LAYER_MAPPING_TRIPLANAR_3
-    _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP2
+    _DETAIL_MAP3 _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF
+    _EMISSION _EMISSIVE_COLOR _LAYEREDLIT_4_LAYERS _LAYER_MAPPING_TRIPLANAR_3 _LAYER_MASK_VERTEX_COLOR
+    _NORMALMAP_TANGENT_SPACE _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2
+    _NORMALMAP_TANGENT_SPACE3
+  m_EnableInstancingVariants: 0
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - DistortionVectors
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap3:
     - _BlendSize1: 0
     - _BlendSize2: 0
     - _BlendSize3: 0
+    - _BlendUsingHeight1: 0
+    - _BlendUsingHeight2: 0
+    - _BlendUsingHeight3: 0
     - _BumpScale: 1
     - _CullMode: 2
     - _Cutoff: 0.5
     - _DstBlend: 0
     - _EmissiveColorMode: 0
     - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 0.01
+    - _HeightAmplitude3: 0.01
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0.5
+    - _HeightCenter3: 0.5
+    - _HeightCenterOffset0: 0
+    - _HeightCenterOffset1: 0
+    - _HeightCenterOffset2: 0
+    - _HeightCenterOffset3: 0
+    - _HeightFactor0: 1
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _HorizonFade: 1
+    - _InheritBaseColor1: 0
+    - _InheritBaseColor2: 0
+    - _InheritBaseColor3: 0
+    - _InheritBaseColorThreshold1: 1
+    - _InheritBaseColorThreshold2: 1
+    - _InheritBaseColorThreshold3: 1
+    - _InheritBaseHeight1: 0
+    - _InheritBaseHeight2: 0
+    - _InheritBaseHeight3: 0
+    - _InheritBaseNormal1: 0
+    - _InheritBaseNormal2: 0
+    - _InheritBaseNormal3: 0
+    - _LayerCenterOffset0: 0.5
+    - _LayerCenterOffset1: 0.5
+    - _LayerCenterOffset2: 0.5
+    - _LayerCenterOffset3: 0.5
+    - _LayerHeightAmplitude0: 0.01
+    - _LayerHeightAmplitude1: 0.01
+    - _LayerHeightAmplitude2: 0.01
+    - _LayerHeightAmplitude3: 0.01
+    - _LayerTiling0: 1
+    - _LayerTiling1: 1
+    - _LayerTiling2: 1
+    - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
+    - _MinimumOpacity0: 1
+    - _MinimumOpacity1: 1
+    - _MinimumOpacity2: 1
+    - _MinimumOpacity3: 1
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
+    - _ObjectScaleAffectTile: 0
+    - _OpacityAsDensity0: 0
+    - _OpacityAsDensity1: 0
+    - _OpacityAsDensity2: 0
+    - _OpacityAsDensity3: 0
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _Smoothness1: 0.5
     - _TexWorldScale1: 1
     - _TexWorldScale2: 1
     - _TexWorldScale3: 0.2
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVMappingPlanar0: 0
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
-    - _UVMappingPlanar3: 0
+    - _UVMappingPlanar3: 1
+    - _UVMappingPlanarBlendMask: 0
+    - _UseDensityMode: 0
+    - _UseHeightBasedBlend: 0
+    - _UseMainLayerInfluence: 0
+    - _VertexColorMode: 0
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer3_Planar.mat.meta

 timeCreated: 1481880057
 licenseType: Pro
 NativeFormatImporter:
+  mainObjectFileID: -1
   userData: '{"GUIDArray":["686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","6c40a6ba55a62fc4c92fdc1cdee2f85a"]}'
   assetBundleName: 
   assetBundleVariant: 

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer3_Triplanar
   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 _LAYEREDLIT_4_LAYERS _LAYER_MAPPING_TRIPLANAR_3
-    _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP2
+    _DETAIL_MAP3 _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF
+    _DOUBLESIDED _EMISSION _EMISSIVE_COLOR _LAYEREDLIT_4_LAYERS _LAYER_MAPPING_TRIPLANAR3
+    _LAYER_MAPPING_TRIPLANAR_3 _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE _NORMALMAP_TANGENT_SPACE0
+    _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2 _NORMALMAP_TANGENT_SPACE3
+  m_EnableInstancingVariants: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses:
     m_TexEnvs:
     - _BaseColorMap0:
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap3:
     - _BlendSize1: 0
     - _BlendSize2: 0
     - _BlendSize3: 0
+    - _BlendUsingHeight1: 0
+    - _BlendUsingHeight2: 0
+    - _BlendUsingHeight3: 0
     - _BumpScale: 1
     - _CullMode: 0
     - _Cutoff: 0.5
     - _DstBlend: 0
     - _EmissiveColorMode: 0
     - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 0.01
+    - _HeightAmplitude3: 0.01
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0.5
+    - _HeightCenter3: 0.5
+    - _HeightCenterOffset0: 0
+    - _HeightCenterOffset1: 0
+    - _HeightCenterOffset2: 0
+    - _HeightCenterOffset3: 0
+    - _HeightFactor0: 1
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _HorizonFade: 1
+    - _InheritBaseColor1: 0
+    - _InheritBaseColor2: 0
+    - _InheritBaseColor3: 0
+    - _InheritBaseColorThreshold1: 1
+    - _InheritBaseColorThreshold2: 1
+    - _InheritBaseColorThreshold3: 1
+    - _InheritBaseHeight1: 0
+    - _InheritBaseHeight2: 0
+    - _InheritBaseHeight3: 0
+    - _InheritBaseNormal1: 0
+    - _InheritBaseNormal2: 0
+    - _InheritBaseNormal3: 0
+    - _LayerCenterOffset0: 0.5
+    - _LayerCenterOffset1: 0.5
+    - _LayerCenterOffset2: 0.5
+    - _LayerCenterOffset3: 0.5
+    - _LayerHeightAmplitude0: 0.01
+    - _LayerHeightAmplitude1: 0.01
+    - _LayerHeightAmplitude2: 0.01
+    - _LayerHeightAmplitude3: 0.01
+    - _LayerTiling0: 1
+    - _LayerTiling1: 1
+    - _LayerTiling2: 1
+    - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
+    - _MinimumOpacity0: 1
+    - _MinimumOpacity1: 1
+    - _MinimumOpacity2: 1
+    - _MinimumOpacity3: 1
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
+    - _ObjectScaleAffectTile: 0
+    - _OpacityAsDensity0: 0
+    - _OpacityAsDensity1: 0
+    - _OpacityAsDensity2: 0
+    - _OpacityAsDensity3: 0
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _Smoothness1: 0.5
     - _TexWorldScale1: 1
     - _TexWorldScale2: 1
     - _TexWorldScale3: 0.2
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
+    - _UseDensityMode: 0
+    - _UseHeightBasedBlend: 0
+    - _UseMainLayerInfluence: 0
+    - _VertexColorMode: 0
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer3_Triplanar.mat.meta

 timeCreated: 1481881618
 licenseType: Pro
 NativeFormatImporter:
+  mainObjectFileID: -1
   userData: '{"GUIDArray":["686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","6c40a6ba55a62fc4c92fdc1cdee2f85a"]}'
   assetBundleName: 
   assetBundleVariant: 

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer3_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 _LAYEREDLIT_4_LAYERS _LAYER_MASK_VERTEX_COLOR
-    _NORMALMAP_TANGENT_SPACE _REQUIRE_UV3
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP2
+    _DETAIL_MAP3 _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF
+    _EMISSION _EMISSIVE_COLOR _LAYEREDLIT_4_LAYERS _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
+    _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2
+    _NORMALMAP_TANGENT_SPACE3
+  m_EnableInstancingVariants: 0
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - DistortionVectors
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap3:
     - _BlendSize1: 0
     - _BlendSize2: 0
     - _BlendSize3: 0
+    - _BlendUsingHeight1: 0
+    - _BlendUsingHeight2: 0
+    - _BlendUsingHeight3: 0
     - _BumpScale: 1
     - _CullMode: 2
     - _Cutoff: 0.5
     - _DstBlend: 0
     - _EmissiveColorMode: 0
     - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 0.01
+    - _HeightAmplitude3: 0.01
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0.5
+    - _HeightCenter3: 0.5
+    - _HeightCenterOffset0: 0
+    - _HeightCenterOffset1: 0
+    - _HeightCenterOffset2: 0
+    - _HeightCenterOffset3: 0
+    - _HeightFactor0: 1
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _HorizonFade: 1
+    - _InheritBaseColor1: 0
+    - _InheritBaseColor2: 0
+    - _InheritBaseColor3: 0
+    - _InheritBaseColorThreshold1: 1
+    - _InheritBaseColorThreshold2: 1
+    - _InheritBaseColorThreshold3: 1
+    - _InheritBaseHeight1: 0
+    - _InheritBaseHeight2: 0
+    - _InheritBaseHeight3: 0
+    - _InheritBaseNormal1: 0
+    - _InheritBaseNormal2: 0
+    - _InheritBaseNormal3: 0
+    - _LayerCenterOffset0: 0.5
+    - _LayerCenterOffset1: 0.5
+    - _LayerCenterOffset2: 0.5
+    - _LayerCenterOffset3: 0.5
+    - _LayerHeightAmplitude0: 0.01
+    - _LayerHeightAmplitude1: 0.01
+    - _LayerHeightAmplitude2: 0.01
+    - _LayerHeightAmplitude3: 0.01
+    - _LayerTiling0: 1
+    - _LayerTiling1: 1
+    - _LayerTiling2: 1
+    - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
+    - _MinimumOpacity0: 1
+    - _MinimumOpacity1: 1
+    - _MinimumOpacity2: 1
+    - _MinimumOpacity3: 1
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
+    - _ObjectScaleAffectTile: 0
+    - _OpacityAsDensity0: 0
+    - _OpacityAsDensity1: 0
+    - _OpacityAsDensity2: 0
+    - _OpacityAsDensity3: 0
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _Smoothness1: 0.5
     - _TexWorldScale1: 1
     - _TexWorldScale2: 1
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
+    - _UseDensityMode: 0
+    - _UseHeightBasedBlend: 0
+    - _UseMainLayerInfluence: 0
+    - _VertexColorMode: 0
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer3_UV0.mat.meta

 timeCreated: 1480681039
 licenseType: Pro
 NativeFormatImporter:
+  mainObjectFileID: -1
   userData: '{"GUIDArray":["686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","6c40a6ba55a62fc4c92fdc1cdee2f85a"]}'
   assetBundleName: 
   assetBundleVariant: 

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer3_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 _LAYEREDLIT_4_LAYERS _LAYER_MASK_VERTEX_COLOR
-    _NORMALMAP_TANGENT_SPACE _REQUIRE_UV3
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP2
+    _DETAIL_MAP3 _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF
+    _EMISSION _EMISSIVE_COLOR _LAYEREDLIT_4_LAYERS _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
+    _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2
+    _NORMALMAP_TANGENT_SPACE3
+  m_EnableInstancingVariants: 0
-  disabledShaderPasses: []
+  disabledShaderPasses:
+  - DistortionVectors
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap3:
     - _BlendSize1: 0
     - _BlendSize2: 0
     - _BlendSize3: 0
+    - _BlendUsingHeight1: 0
+    - _BlendUsingHeight2: 0
+    - _BlendUsingHeight3: 0
     - _BumpScale: 1
     - _CullMode: 2
     - _Cutoff: 0.5
     - _DstBlend: 0
     - _EmissiveColorMode: 0
     - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 0.01
+    - _HeightAmplitude3: 0.01
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0.5
+    - _HeightCenter3: 0.5
+    - _HeightCenterOffset0: 0
+    - _HeightCenterOffset1: 0
+    - _HeightCenterOffset2: 0
+    - _HeightCenterOffset3: 0
+    - _HeightFactor0: 1
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _HorizonFade: 1
+    - _InheritBaseColor1: 0
+    - _InheritBaseColor2: 0
+    - _InheritBaseColor3: 0
+    - _InheritBaseColorThreshold1: 1
+    - _InheritBaseColorThreshold2: 1
+    - _InheritBaseColorThreshold3: 1
+    - _InheritBaseHeight1: 0
+    - _InheritBaseHeight2: 0
+    - _InheritBaseHeight3: 0
+    - _InheritBaseNormal1: 0
+    - _InheritBaseNormal2: 0
+    - _InheritBaseNormal3: 0
+    - _LayerCenterOffset0: 0.5
+    - _LayerCenterOffset1: 0.5
+    - _LayerCenterOffset2: 0.5
+    - _LayerCenterOffset3: 0.5
+    - _LayerHeightAmplitude0: 0.01
+    - _LayerHeightAmplitude1: 0.01
+    - _LayerHeightAmplitude2: 0.01
+    - _LayerHeightAmplitude3: 0.01
+    - _LayerTiling0: 1
+    - _LayerTiling1: 1
+    - _LayerTiling2: 1
+    - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
+    - _MinimumOpacity0: 1
+    - _MinimumOpacity1: 1
+    - _MinimumOpacity2: 1
+    - _MinimumOpacity3: 1
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
+    - _ObjectScaleAffectTile: 0
+    - _OpacityAsDensity0: 0
+    - _OpacityAsDensity1: 0
+    - _OpacityAsDensity2: 0
+    - _OpacityAsDensity3: 0
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _Smoothness1: 0.5
     - _TexWorldScale1: 1
     - _TexWorldScale2: 1
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
+    - _UseDensityMode: 0
+    - _UseHeightBasedBlend: 0
+    - _UseMainLayerInfluence: 0
+    - _VertexColorMode: 0
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer3_UV1.mat.meta

 timeCreated: 1480689462
 licenseType: Pro
 NativeFormatImporter:
+  mainObjectFileID: -1
   userData: '{"GUIDArray":["686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","6c40a6ba55a62fc4c92fdc1cdee2f85a"]}'
   assetBundleName: 
   assetBundleVariant: 

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer3_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 _LAYEREDLIT_4_LAYERS _LAYER_MASK_VERTEX_COLOR
-    _NORMALMAP_TANGENT_SPACE _REQUIRE_UV2_OR_UV3 _REQUIRE_UV3
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP2
+    _DETAIL_MAP3 _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF
+    _EMISSION _EMISSIVE_COLOR _LAYEREDLIT_4_LAYERS _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
+    _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2
+    _NORMALMAP_TANGENT_SPACE3 _REQUIRE_UV2 _REQUIRE_UV2_OR_UV3
+  m_EnableInstancingVariants: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses:
     m_TexEnvs:
     - _BaseColorMap0:
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap3:
     - _BlendSize1: 0
     - _BlendSize2: 0
     - _BlendSize3: 0
+    - _BlendUsingHeight1: 0
+    - _BlendUsingHeight2: 0
+    - _BlendUsingHeight3: 0
     - _BumpScale: 1
     - _CullMode: 2
     - _Cutoff: 0.5
     - _DstBlend: 0
     - _EmissiveColorMode: 0
     - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 0.01
+    - _HeightAmplitude3: 0.01
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0.5
+    - _HeightCenter3: 0.5
+    - _HeightCenterOffset0: 0
+    - _HeightCenterOffset1: 0
+    - _HeightCenterOffset2: 0
+    - _HeightCenterOffset3: 0
+    - _HeightFactor0: 1
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _HorizonFade: 1
+    - _InheritBaseColor1: 0
+    - _InheritBaseColor2: 0
+    - _InheritBaseColor3: 0
+    - _InheritBaseColorThreshold1: 1
+    - _InheritBaseColorThreshold2: 1
+    - _InheritBaseColorThreshold3: 1
+    - _InheritBaseHeight1: 0
+    - _InheritBaseHeight2: 0
+    - _InheritBaseHeight3: 0
+    - _InheritBaseNormal1: 0
+    - _InheritBaseNormal2: 0
+    - _InheritBaseNormal3: 0
+    - _LayerCenterOffset0: 0.5
+    - _LayerCenterOffset1: 0.5
+    - _LayerCenterOffset2: 0.5
+    - _LayerCenterOffset3: 0.5
+    - _LayerHeightAmplitude0: 0.01
+    - _LayerHeightAmplitude1: 0.01
+    - _LayerHeightAmplitude2: 0.01
+    - _LayerHeightAmplitude3: 0.01
+    - _LayerTiling0: 1
+    - _LayerTiling1: 1
+    - _LayerTiling2: 1
+    - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
+    - _MinimumOpacity0: 1
+    - _MinimumOpacity1: 1
+    - _MinimumOpacity2: 1
+    - _MinimumOpacity3: 1
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
+    - _ObjectScaleAffectTile: 0
+    - _OpacityAsDensity0: 0
+    - _OpacityAsDensity1: 0
+    - _OpacityAsDensity2: 0
+    - _OpacityAsDensity3: 0
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _Smoothness1: 0.5
     - _TexWorldScale1: 1
     - _TexWorldScale2: 1
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
+    - _UseDensityMode: 0
+    - _UseHeightBasedBlend: 0
+    - _UseMainLayerInfluence: 0
+    - _VertexColorMode: 0
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer3_UV2.mat.meta

 timeCreated: 1481881791
 licenseType: Pro
 NativeFormatImporter:
+  mainObjectFileID: -1
   userData: '{"GUIDArray":["686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","6c40a6ba55a62fc4c92fdc1cdee2f85a"]}'
   assetBundleName: 
   assetBundleVariant: 

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer3_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 _LAYEREDLIT_4_LAYERS _LAYER_MASK_VERTEX_COLOR
-    _NORMALMAP_TANGENT_SPACE _REQUIRE_UV2_OR_UV3 _REQUIRE_UV3
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP0 _DETAIL_MAP1 _DETAIL_MAP2
+    _DETAIL_MAP3 _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF _DISTORTIONONLY_OFF
+    _EMISSION _EMISSIVE_COLOR _LAYEREDLIT_4_LAYERS _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
+    _NORMALMAP_TANGENT_SPACE0 _NORMALMAP_TANGENT_SPACE1 _NORMALMAP_TANGENT_SPACE2
+    _NORMALMAP_TANGENT_SPACE3 _REQUIRE_UV2_OR_UV3 _REQUIRE_UV3
+  m_EnableInstancingVariants: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses:
     m_TexEnvs:
     - _BaseColorMap0:
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
-        m_Texture: {fileID: 2800000, guid: 866df234625deb44a8db971e2f2dca7c, type: 3}
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap3:
     - _BlendSize1: 0
     - _BlendSize2: 0
     - _BlendSize3: 0
+    - _BlendUsingHeight1: 0
+    - _BlendUsingHeight2: 0
+    - _BlendUsingHeight3: 0
     - _BumpScale: 1
     - _CullMode: 2
     - _Cutoff: 0.5
     - _DstBlend: 0
     - _EmissiveColorMode: 0
     - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
+    - _HeightAmplitude0: 0.01
+    - _HeightAmplitude1: 0.01
+    - _HeightAmplitude2: 0.01
+    - _HeightAmplitude3: 0.01
+    - _HeightCenter0: 0.5
+    - _HeightCenter1: 0.5
+    - _HeightCenter2: 0.5
+    - _HeightCenter3: 0.5
+    - _HeightCenterOffset0: 0
+    - _HeightCenterOffset1: 0
+    - _HeightCenterOffset2: 0
+    - _HeightCenterOffset3: 0
+    - _HeightFactor0: 1
     - _HeightFactor1: 1
     - _HeightFactor2: 1
     - _HeightFactor3: 1
     - _HeightScale1: 1
     - _HeightScale2: 1
     - _HeightScale3: 1
+    - _HorizonFade: 1
+    - _InheritBaseColor1: 0
+    - _InheritBaseColor2: 0
+    - _InheritBaseColor3: 0
+    - _InheritBaseColorThreshold1: 1
+    - _InheritBaseColorThreshold2: 1
+    - _InheritBaseColorThreshold3: 1
+    - _InheritBaseHeight1: 0
+    - _InheritBaseHeight2: 0
+    - _InheritBaseHeight3: 0
+    - _InheritBaseNormal1: 0
+    - _InheritBaseNormal2: 0
+    - _InheritBaseNormal3: 0
+    - _LayerCenterOffset0: 0.5
+    - _LayerCenterOffset1: 0.5
+    - _LayerCenterOffset2: 0.5
+    - _LayerCenterOffset3: 0.5
+    - _LayerHeightAmplitude0: 0.01
+    - _LayerHeightAmplitude1: 0.01
+    - _LayerHeightAmplitude2: 0.01
+    - _LayerHeightAmplitude3: 0.01
+    - _LayerTiling0: 1
+    - _LayerTiling1: 1
+    - _LayerTiling2: 1
+    - _LayerTiling3: 1
+    - _LayerTilingBlendMask: 1
+    - _MinimumOpacity0: 1
+    - _MinimumOpacity1: 1
+    - _MinimumOpacity2: 1
+    - _MinimumOpacity3: 1
+    - _NormalMapSpace0: 0
+    - _NormalMapSpace1: 0
+    - _NormalMapSpace2: 0
+    - _NormalMapSpace3: 0
+    - _NormalScale0: 1
+    - _NormalScale1: 1
+    - _NormalScale2: 1
+    - _NormalScale3: 1
+    - _ObjectScaleAffectTile: 0
+    - _OpacityAsDensity0: 0
+    - _OpacityAsDensity1: 0
+    - _OpacityAsDensity2: 0
+    - _OpacityAsDensity3: 0
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _Smoothness0: 0.5
     - _Smoothness1: 0.5
     - _TexWorldScale1: 1
     - _TexWorldScale2: 1
     - _TexWorldScale3: 1
+    - _TexWorldScaleBlendMask: 1
+    - _UVBlendMask: 0
     - _UVDetail: 0
     - _UVDetail0: 0
     - _UVDetail1: 0
     - _UVMappingPlanar1: 0
     - _UVMappingPlanar2: 0
     - _UVMappingPlanar3: 0
+    - _UVMappingPlanarBlendMask: 0
+    - _UseDensityMode: 0
+    - _UseHeightBasedBlend: 0
+    - _UseMainLayerInfluence: 0
+    - _VertexColorMode: 0
     - _ZTestMode: 8
     - _ZWrite: 1
     m_Colors:

Assets/TestScenes/HDTest/LayeredLitTest/Material/Layered_Layer3_UV3.mat.meta

 timeCreated: 1481881474
 licenseType: Pro
 NativeFormatImporter:
+  mainObjectFileID: -1
   userData: '{"GUIDArray":["686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","6c40a6ba55a62fc4c92fdc1cdee2f85a"]}'
   assetBundleName: 
   assetBundleVariant: 

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

   m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
     _DISTORTIONONLY_OFF _EMISSION _HEIGHTMAP _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SubsurfaceRadiusMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ThicknessMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _DstBlend: 0
     - _EmissiveColorMode: 1
     - _EmissiveIntensity: 0
+    - _EnablePerPixelDisplacement: 0
     - _GlossMapScale: 1
     - _Glossiness: 0
     - _GlossyReflections: 1
     - _HeightMapMode: 0
     - _HeightScale: 0.1
+    - _HorizonFade: 1
+    - _MaterialID: 0
     - _MaterialId: 0
     - _Metallic: 0
     - _Mode: 0
     - _OcclusionStrength: 1
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
     - _Parallax: 0.02
     - _Smoothness: 1
     - _SmoothnessAO: 0
     - _SmoothnessVar: 0.5
     - _SpecularHighlights: 1
     - _SrcBlend: 1
+    - _StencilRef: 0
+    - _SubsurfaceProfile: 0
+    - _SubsurfaceRadius: 1
+    - _Thickness: 0.5
     - _Tiling: 1
     - _TilingDetail: 4
     - _UVBase: 1

ProjectSettings/GraphicsSettings.asset

   - {fileID: 4800000, guid: 595434cc3b6405246b6cd3086d0b6f7d, type: 3}
   - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 103, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}