Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop

Assets/ScriptableRenderLoop/HDRenderLoop/Material/LayeredLit/Editor/LayeredLitUI.cs

 
 					if(!exclusionList.Contains(propertyName))
 					{
-                    if (material.HasProperty(layerPropertyName))
-                    {
-                        ShaderUtil.ShaderPropertyType type = ShaderUtil.GetPropertyType(layerShader, i);
-                        switch (type)
-                        {
-                            case ShaderUtil.ShaderPropertyType.Color:
-                            {
-                                material.SetColor(layerPropertyName, layerMaterial.GetColor(propertyName));
-                                break;
-                            }
-                            case ShaderUtil.ShaderPropertyType.Float:
-                            case ShaderUtil.ShaderPropertyType.Range:
-                            {
-                                material.SetFloat(layerPropertyName, layerMaterial.GetFloat(propertyName));
-                                break;
-                            }
-                            case ShaderUtil.ShaderPropertyType.Vector:
-                            {
-                                material.SetVector(layerPropertyName, layerMaterial.GetVector(propertyName));
-                                break;
-                            }
-                            case ShaderUtil.ShaderPropertyType.TexEnv:
-                            {
-                                material.SetTexture(layerPropertyName, layerMaterial.GetTexture(propertyName));
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
+						if (material.HasProperty(layerPropertyName))
+						{
+							ShaderUtil.ShaderPropertyType type = ShaderUtil.GetPropertyType(layerShader, i);
+							switch (type)
+							{
+								case ShaderUtil.ShaderPropertyType.Color:
+								{
+									material.SetColor(layerPropertyName, layerMaterial.GetColor(propertyName));
+									break;
+								}
+								case ShaderUtil.ShaderPropertyType.Float:
+								case ShaderUtil.ShaderPropertyType.Range:
+								{
+									material.SetFloat(layerPropertyName, layerMaterial.GetFloat(propertyName));
+									break;
+								}
+								case ShaderUtil.ShaderPropertyType.Vector:
+								{
+									material.SetVector(layerPropertyName, layerMaterial.GetVector(propertyName));
+									break;
+								}
+								case ShaderUtil.ShaderPropertyType.TexEnv:
+								{
+									material.SetTexture(layerPropertyName, layerMaterial.GetTexture(propertyName));
+									material.SetTextureOffset(layerPropertyName, layerMaterial.GetTextureOffset(propertyName));
+									material.SetTextureScale(layerPropertyName, layerMaterial.GetTextureScale(propertyName));
+									break;
+								}
+							}
+						}
+					}
+				}
+			}
         }
 
         void InitializeMaterialLayers(AssetImporter materialImporter)
             m_MaterialEditor.ShaderProperty(layerUVBase[layerIndex], styles.UVBaseText);
             if (EditorGUI.EndChangeCheck())
             {
+				SynchronizeLayerProperties(layerIndex);
                 result = true;
             }
             if (((LayerUVBaseMapping)layerUVBase[layerIndex].floatValue == LayerUVBaseMapping.Planar) ||
                 m_MaterialEditor.ShaderProperty(layerUVDetail[layerIndex], styles.UVDetailText);
                 if (EditorGUI.EndChangeCheck())
                 {
+					SynchronizeLayerProperties(layerIndex);
                     result = true;
                 }
             }

Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/Lit.shader

         _NormalMap("NormalMap", 2D) = "bump" {}
 
         _HeightMap("HeightMap", 2D) = "black" {}
-        _HeightScale("Height Scale", Float) = 1
+        _HeightScale("Height Scale", Float) = 0.01
         _HeightBias("Height Bias", Float) = 0
 
         _TangentMap("TangentMap", 2D) = "bump" {}
         _DetailMask("DetailMask", 2D) = "white" {}
         _DetailAlbedoScale("_DetailAlbedoScale", Range(-2.0, 2.0)) = 1
         _DetailNormalScale("_DetailNormalScale", Range(0.0, 2.0)) = 1
-        _DetailSmoothnessScale("_DetailSmoothnessScale", Range(-2.0, 2.0)) = 1
+        _DetailSmoothnessScale("_DetailSmoothnessScale", Range(-2.0, 2.0)) = 0.01
         _DetailHeightScale("_DetailHeightScale", Range(-2.0, 2.0)) = 1
         _DetailAOScale("_DetailAOScale", Range(-2.0, 2.0)) = 1        
 

Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/LitSurfaceData.hlsl

 #else
     surfaceData.perceptualSmoothness = 1.0;
 #endif
-    surfaceData.perceptualSmoothness *= _Smoothness;
+	surfaceData.perceptualSmoothness *= ADD_IDX(_Smoothness);
 #ifdef _DETAIL_MAP
     surfaceData.perceptualSmoothness *= LerpWhiteTo(2.0 * saturate(detailSmoothness * ADD_IDX(_DetailSmoothnessScale)), detailMask);
 #endif
     surfaceData.metallic = 1.0;
     surfaceData.ambientOcclusion = 1.0;
 #endif
-    surfaceData.metallic *= _Metallic;
+    surfaceData.metallic *= ADD_IDX(_Metallic);
 
     // This part of the code is not used in case of layered shader but we keep the same macro system for simplicity
 #if !defined(LAYERED_LIT_SHADER)
 #else
     surfaceData.anisotropy = 1.0;
 #endif
-    surfaceData.anisotropy *= _Anisotropy;
+    surfaceData.anisotropy *= ADD_IDX(_Anisotropy);
 
     surfaceData.specular = 0.04;
 

Assets/TestScenes/HDTest/GlobalIlluminationTest.unity

   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.5456174, g: 0.39782104, b: 0.24038851, a: 1}
+  m_IndirectSpecularColor: {r: 0.6238628, g: 0.56322443, b: 0.5425187, a: 1}
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
   m_Component:
   - component: {fileID: 565152815}
   - component: {fileID: 565152816}
+  - component: {fileID: 565152817}
   m_Layer: 0
   m_Name: Spotlight
   m_TagString: Untagged
   m_BounceIntensity: 1
   m_ShadowRadius: 0
   m_ShadowAngle: 0
+--- !u!114 &565152817
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 565152814}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  shadowResolution: 512
+  shadowDimmer: 1
+  affectDiffuse: 1
+  affectSpecular: 1
+  archetype: 0
+  isDoubleSided: 0
+  areaLightLength: 0
+  areaLightWidth: 0
 --- !u!1 &841702834
 GameObject:
   m_ObjectHideFlags: 0
   shadowDimmer: 1
   affectDiffuse: 1
   affectSpecular: 1
-  treatAsAreaLight: 0
+  archetype: 0
   isDoubleSided: 0
   areaLightLength: 0
   areaLightWidth: 0
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 1543726725}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -6.33, y: 0.428, z: -5.0499997}
+  m_LocalPosition: {x: -6.33, y: 0.428, z: -4.84}
   m_LocalScale: {x: 1.6119599, y: 1.6119599, z: 1.6119599}
   m_Children: []
   m_Father: {fileID: 1027688891}

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 _NORMALMAP_TANGENT_SPACE
-    _REQUIRE_UV3
+  disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
     - _Parallax: 0.02
     - _Smoothness: 0.5
     - _Smoothness0: 0.5
-    - _Smoothness1: 0.5
+    - _Smoothness1: 0.2
-    - _Smoothness3: 0.5
+    - _Smoothness3: 0.4
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

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

 fileFormatVersion: 2
 guid: f5e011eaf3efd6a418f211803a5f7d74
-timeCreated: 1480682649
+timeCreated: 1480943223
 licenseType: Pro
 NativeFormatImporter:
   userData: '{"GUIDArray":["fbea672215bd9944f8d9f98d5437e3cb","b91619c97bb14b64b82c0cdeaac0cc68","be6f395f0458348419faf76aca4cf856","000d0f1d5b188ed43a674de93e854997"]}'

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

   m_Shader: {fileID: 4800000, guid: 81d02e8644315b742b154842a3a2f98c, type: 3}
   m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
     _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
-    _REQUIRE_UV3
+  disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
         m_Offset: {x: 0, y: 0}
     - _DetailMap0:
         m_Texture: {fileID: 2800000, guid: 21bed8c058c65f84e92fd4e28dd6ec51, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
+        m_Scale: {x: 2, y: 2}
+        m_Offset: {x: 0.25, y: 0}
     - _DetailMap1:
         m_Texture: {fileID: 2800000, guid: 21bed8c058c65f84e92fd4e28dd6ec51, type: 3}
         m_Scale: {x: 1, y: 1}

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

 fileFormatVersion: 2
 guid: 91a8197de5f6d074c8dac4416c16cbb2
-timeCreated: 1480680814
+timeCreated: 1480934271
 licenseType: Pro
 NativeFormatImporter:
   userData: '{"GUIDArray":["a02ccd7b5946da643a654ccea743375b","686eb5593c0e94f4eb86ca1d3cfef7fa","",""]}'

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

   m_Shader: {fileID: 4800000, guid: 81d02e8644315b742b154842a3a2f98c, type: 3}
   m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
     _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MAPPING_TRIPLANAR_0 _LAYER_MASK_VERTEX_COLOR
-    _NORMALMAP_TANGENT_SPACE _REQUIRE_UV3
+    _NORMALMAP_TANGENT_SPACE
+  disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
         m_Offset: {x: 0, y: 0}
     - _DetailMap0:
         m_Texture: {fileID: 2800000, guid: 21bed8c058c65f84e92fd4e28dd6ec51, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
+        m_Scale: {x: 2, y: 2}
+        m_Offset: {x: 0.25, y: 0}
     - _DetailMap1:
         m_Texture: {fileID: 2800000, guid: 21bed8c058c65f84e92fd4e28dd6ec51, type: 3}
         m_Scale: {x: 1, y: 1}

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

 fileFormatVersion: 2
 guid: b8805bd8838bdf34996bedcee9ebbf10
-timeCreated: 1480680860
+timeCreated: 1480934285
 licenseType: Pro
 NativeFormatImporter:
   userData: '{"GUIDArray":["a02ccd7b5946da643a654ccea743375b","686eb5593c0e94f4eb86ca1d3cfef7fa","",""]}'

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

   m_Shader: {fileID: 4800000, guid: 81d02e8644315b742b154842a3a2f98c, type: 3}
   m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
     _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
-    _REQUIRE_UV3
+  disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
         m_Offset: {x: 0, y: 0}
     - _DetailMap0:
         m_Texture: {fileID: 2800000, guid: 21bed8c058c65f84e92fd4e28dd6ec51, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
+        m_Scale: {x: 2, y: 2}
+        m_Offset: {x: 0.25, y: 0}
     - _DetailMap1:
         m_Texture: {fileID: 2800000, guid: 21bed8c058c65f84e92fd4e28dd6ec51, type: 3}
         m_Scale: {x: 1, y: 1}

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

 fileFormatVersion: 2
 guid: ea0f1f2983d72874084abf3a8d75bf04
-timeCreated: 1480680347
+timeCreated: 1480933657
 licenseType: Pro
 NativeFormatImporter:
   userData: '{"GUIDArray":["a02ccd7b5946da643a654ccea743375b","686eb5593c0e94f4eb86ca1d3cfef7fa","",""]}'

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

   m_Shader: {fileID: 4800000, guid: 81d02e8644315b742b154842a3a2f98c, type: 3}
   m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
     _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
-    _REQUIRE_UV3
+  disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
         m_Offset: {x: 0, y: 0}
     - _DetailMap0:
         m_Texture: {fileID: 2800000, guid: 21bed8c058c65f84e92fd4e28dd6ec51, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
+        m_Scale: {x: 2, y: 2}
+        m_Offset: {x: 0.25, y: 0}
     - _DetailMap1:
         m_Texture: {fileID: 2800000, guid: 21bed8c058c65f84e92fd4e28dd6ec51, type: 3}
         m_Scale: {x: 1, y: 1}

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

 fileFormatVersion: 2
 guid: dde88fa6f8dc19a4eb2d828bf0f4d91c
-timeCreated: 1480680577
+timeCreated: 1480934261
 licenseType: Pro
 NativeFormatImporter:
   userData: '{"GUIDArray":["a02ccd7b5946da643a654ccea743375b","686eb5593c0e94f4eb86ca1d3cfef7fa","",""]}'

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

   m_PrefabInternal: {fileID: 0}
   m_Name: Layered_Layer0_UV3
   m_Shader: {fileID: 4800000, guid: 81d02e8644315b742b154842a3a2f98c, type: 3}
-  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
+  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
-    _REQUIRE_UV3
+  disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _DetailMap0:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
+        m_Texture: {fileID: 2800000, guid: 21bed8c058c65f84e92fd4e28dd6ec51, type: 3}
+        m_Scale: {x: 2, y: 2}
+        m_Offset: {x: 0.25, y: 0}
-        m_Texture: {fileID: 0}
+        m_Texture: {fileID: 2800000, guid: 21bed8c058c65f84e92fd4e28dd6ec51, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _DetailMap2:

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

 fileFormatVersion: 2
 guid: 3e3a7e6d5f3b8164eb7c110dd465185d
-timeCreated: 1480680589
+timeCreated: 1480934266
 licenseType: Pro
 NativeFormatImporter:
   userData: '{"GUIDArray":["a02ccd7b5946da643a654ccea743375b","686eb5593c0e94f4eb86ca1d3cfef7fa","",""]}'

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

   m_Shader: {fileID: 4800000, guid: 81d02e8644315b742b154842a3a2f98c, type: 3}
   m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
     _DISTORTIONONLY_OFF _EMISSION _EMISSIVE_COLOR _LAYEREDLIT_4_LAYERS _LAYER_MAPPING_TRIPLANAR_3
-    _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE _REQUIRE_UV3
+    _LAYER_MASK_VERTEX_COLOR _NORMALMAP_TANGENT_SPACE
+  disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

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

 fileFormatVersion: 2
 guid: 0284c7765797bfe42b104f08550600a8
-timeCreated: 1480681151
+timeCreated: 1480935617
 licenseType: Pro
 NativeFormatImporter:
   userData: '{"GUIDArray":["686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","6c40a6ba55a62fc4c92fdc1cdee2f85a"]}'

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

 fileFormatVersion: 2
 guid: 793d1137891c0e5409fa196157cb6572
-timeCreated: 1480681057
+timeCreated: 1480689462
 licenseType: Pro
 NativeFormatImporter:
   userData: '{"GUIDArray":["686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","686eb5593c0e94f4eb86ca1d3cfef7fa","6c40a6ba55a62fc4c92fdc1cdee2f85a"]}'

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

   m_Name: Lit_Blue
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
   m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
-    _DISTORTIONONLY_OFF _EMISSION _NORMALMAP_TANGENT_SPACE _REQUIRE_UV3
+    _DISTORTIONONLY_OFF _EMISSION _NORMALMAP_TANGENT_SPACE
+  disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
     - _NormalMapSpace: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _Smoothness: 0.5
+    - _Smoothness: 0.4
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

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

   m_Name: Lit_Green
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
   m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
-    _DISTORTIONONLY_OFF _EMISSION _NORMALMAP_TANGENT_SPACE _REQUIRE_UV3
+    _DISTORTIONONLY_OFF _EMISSION _NORMALMAP_TANGENT_SPACE
+  disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

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

   m_Name: Lit_Red
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
   m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
-    _DISTORTIONONLY_OFF _EMISSION _NORMALMAP_TANGENT_SPACE _REQUIRE_UV3
+    _DISTORTIONONLY_OFF _EMISSION _NORMALMAP_TANGENT_SPACE
+  disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
     - _NormalMapSpace: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
-    - _Smoothness: 0.5
+    - _Smoothness: 0.2
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 1

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

   m_Name: Lit_UVChart_Layer0_Detail
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
   m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
-    _DISTORTIONONLY_OFF _EMISSION _NORMALMAP _NORMALMAP_TANGENT_SPACE _REQUIRE_UV3
+    _DISTORTIONONLY_OFF _EMISSION _NORMALMAP _NORMALMAP_TANGENT_SPACE
+  disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
         m_Offset: {x: 0, y: 0}
     - _DetailMap:
         m_Texture: {fileID: 2800000, guid: 21bed8c058c65f84e92fd4e28dd6ec51, type: 3}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
+        m_Scale: {x: 2, y: 2}
+        m_Offset: {x: 0.25, y: 0}
     - _DetailMask:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}

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

   m_Name: Lit_White
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
   m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DETAIL_MAP_WITH_NORMAL _DISTORTIONDEPTHTEST_OFF
-    _DISTORTIONONLY_OFF _EMISSION _NORMALMAP_TANGENT_SPACE _REQUIRE_UV3
+    _DISTORTIONONLY_OFF _EMISSION _NORMALMAP_TANGENT_SPACE
+  disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs: