Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Fix-blend-mode

SampleScenes/HDTest/Material/HDRenderLoopMaterials/Grid_Planar.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Grid_Planar
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DEPTHOFFSETENABLE_OFF _DISTORTIONDEPTHTEST_OFF
-    _DISTORTIONENABLE_OFF _DISTORTIONONLY_OFF _DOUBLESIDED_ON _ENABLEPERPIXELDISPLACEMENT_OFF
-    _ENABLEWIND_OFF _MAPPING_TRIPLANAR _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _DOUBLESIDED_ON _MAPPING_TRIPLANAR
+    _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
         m_Offset: {x: 0, y: 0}
     - _BaseColorMap:
         m_Texture: {fileID: 2800000, guid: fef12d96364197f49b3aac63e72bf9d9, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _DetailMap:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _ATDistance: 1
+    - _AlbedoAffectEmissive: 0
     - _AlphaCutoff: 0.5
     - _AlphaCutoffEnable: 0
     - _Anisotropy: 0
     - _DetailAlbedoScale: 1
     - _DetailNormalScale: 1
     - _DetailSmoothnessScale: 1
+    - _DisplacementLockObjectScale: 1
+    - _DisplacementLockTilingScale: 1
+    - _DisplacementMode: 0
+    - _DistortionBlendMode: 0
+    - _DistortionBlurBlendMode: 0
+    - _DistortionBlurDstBlend: 1
+    - _DistortionBlurRemapMax: 1
+    - _DistortionBlurRemapMin: 0
+    - _DistortionBlurScale: 1
+    - _DistortionBlurSrcBlend: 1
+    - _DistortionDstBlend: 1
+    - _DistortionScale: 1
+    - _DistortionSrcBlend: 1
     - _DoubleSidedEnable: 1
     - _DoubleSidedNormalMode: 1
     - _Drag: 1
+    - _EnableBlendModeAccurateLighting: 1
+    - _EnableBlendModePreserveSpecularLighting: 1
+    - _EnableFogOnTransparent: 1
+    - _EnableSpecularOcclusion: 0
+    - _EnableTransparentFog: 1
+    - _HeightMax: 1
+    - _HeightMin: -1
+    - _IOR: 1
+    - _InvTilingScale: 1
+    - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
     - _NormalMapSpace: 0
     - _PPDMinSamples: 5
+    - _PPDPrimitiveLength: 1
+    - _PPDPrimitiveWidth: 1
+    - _PreRefractionPass: 0
+    - _RefractionMode: 0
+    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMin: 0
     - _SrcBlend: 1
     - _StencilRef: 2
     - _Stiffness: 1
     - _TexWorldScale: 1
     - _Thickness: 1
+    - _ThicknessMultiplier: 1
     - _UVBase: 5
     - _UVDetail: 0
     - _ZTestMode: 8
     - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
     - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
     - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

SampleScenes/HDTest/Material/HDRenderLoopMaterials/Grid_Red_0.3x6.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Grid_Red_0.3x6
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _ALPHACUTOFFENABLE_OFF _DEPTHOFFSETENABLE_OFF _DISTORTIONDEPTHTEST_OFF
-    _DISTORTIONENABLE_OFF _DISTORTIONONLY_OFF _DOUBLESIDEDENABLE_OFF _ENABLEPERPIXELDISPLACEMENT_OFF
-    _ENABLEWIND_OFF _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _BaseColorMap:
         m_Texture: {fileID: 2800000, guid: fef12d96364197f49b3aac63e72bf9d9, type: 3}
         m_Scale: {x: 0.3, y: 6}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _DetailMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
+    - _ATDistance: 1
+    - _AlbedoAffectEmissive: 0
     - _AlphaCutoff: 0.5
     - _AlphaCutoffEnable: 0
     - _Anisotropy: 0
     - _DetailAlbedoScale: 1
     - _DetailNormalScale: 1
     - _DetailSmoothnessScale: 1
+    - _DisplacementLockObjectScale: 1
+    - _DisplacementLockTilingScale: 1
+    - _DisplacementMode: 0
+    - _DistortionBlendMode: 0
+    - _DistortionBlurBlendMode: 0
+    - _DistortionBlurDstBlend: 1
+    - _DistortionBlurRemapMax: 1
+    - _DistortionBlurRemapMin: 0
+    - _DistortionBlurScale: 1
+    - _DistortionBlurSrcBlend: 1
+    - _DistortionDstBlend: 1
+    - _DistortionScale: 1
+    - _DistortionSrcBlend: 1
     - _DoubleSidedEnable: 0
     - _DoubleSidedNormalMode: 1
     - _Drag: 1
+    - _EnableBlendModeAccurateLighting: 1
+    - _EnableBlendModePreserveSpecularLighting: 1
+    - _EnableFogOnTransparent: 1
+    - _EnableSpecularOcclusion: 0
+    - _EnableTransparentFog: 1
+    - _HeightMax: 1
+    - _HeightMin: -1
+    - _IOR: 1
+    - _InvTilingScale: 1
+    - _LinkDetailsWithBase: 1
     - _MaterialID: 1
     - _Metallic: 0
     - _NormalMapSpace: 0
     - _PPDMinSamples: 5
+    - _PPDPrimitiveLength: 1
+    - _PPDPrimitiveWidth: 1
+    - _PreRefractionPass: 0
+    - _RefractionMode: 0
+    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMin: 0
     - _SrcBlend: 1
     - _StencilRef: 2
     - _Stiffness: 1
     - _TexWorldScale: 1
     - _Thickness: 1
+    - _ThicknessMultiplier: 1
     - _UVBase: 0
     - _UVDetail: 0
     - _ZTestMode: 8
     - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
     - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
     - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
+    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

SampleScenes/HDTest/SkyFogTest.unity

     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 87dc9ecf0fda675419ce82a06ffdaa23, type: 2}
   m_IsPrefabParent: 0
+--- !u!1001 &616099592
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 919865824}
+    m_Modifications:
+    - target: {fileID: 4590821631456672, guid: 63d293d8d9b22af4eb3a41f61a9d3538, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: 0.65092087
+      objectReference: {fileID: 0}
+    - target: {fileID: 4590821631456672, guid: 63d293d8d9b22af4eb3a41f61a9d3538, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: -2.8777113
+      objectReference: {fileID: 0}
+    - target: {fileID: 4590821631456672, guid: 63d293d8d9b22af4eb3a41f61a9d3538, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 55.22
+      objectReference: {fileID: 0}
+    - target: {fileID: 4590821631456672, guid: 63d293d8d9b22af4eb3a41f61a9d3538, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4590821631456672, guid: 63d293d8d9b22af4eb3a41f61a9d3538, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4590821631456672, guid: 63d293d8d9b22af4eb3a41f61a9d3538, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4590821631456672, guid: 63d293d8d9b22af4eb3a41f61a9d3538, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4590821631456672, guid: 63d293d8d9b22af4eb3a41f61a9d3538, type: 2}
+      propertyPath: m_RootOrder
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 23355822747673064, guid: 63d293d8d9b22af4eb3a41f61a9d3538,
+        type: 2}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 544a5d9e76974a740b92437acef58b62, type: 2}
+    - target: {fileID: 4590821631456672, guid: 63d293d8d9b22af4eb3a41f61a9d3538, type: 2}
+      propertyPath: m_LocalScale.x
+      value: 0.59999996
+      objectReference: {fileID: 0}
+    - target: {fileID: 4590821631456672, guid: 63d293d8d9b22af4eb3a41f61a9d3538, type: 2}
+      propertyPath: m_LocalScale.y
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 4590821631456672, guid: 63d293d8d9b22af4eb3a41f61a9d3538, type: 2}
+      propertyPath: m_LocalScale.z
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 1142537199752488, guid: 63d293d8d9b22af4eb3a41f61a9d3538, type: 2}
+      propertyPath: m_Name
+      value: Block_0.3x6_Lit_Lerp (2)
+      objectReference: {fileID: 0}
+    - target: {fileID: 1142537199752488, guid: 63d293d8d9b22af4eb3a41f61a9d3538, type: 2}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 63d293d8d9b22af4eb3a41f61a9d3538, type: 2}
+  m_IsPrefabParent: 0
+--- !u!4 &616099593 stripped
+Transform:
+  m_PrefabParentObject: {fileID: 4590821631456672, guid: 63d293d8d9b22af4eb3a41f61a9d3538,
+    type: 2}
+  m_PrefabInternal: {fileID: 616099592}
 --- !u!1001 &691539950
 Prefab:
   m_ObjectHideFlags: 0
   - {fileID: 548582831}
   - {fileID: 691539951}
   - {fileID: 1671222037}
+  - {fileID: 616099593}
   m_Father: {fileID: 0}
   m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
         type: 2}
       propertyPath: m_Materials.Array.data[0]
       value: 
-      objectReference: {fileID: 2100000, guid: 544a5d9e76974a740b92437acef58b62, type: 2}
+      objectReference: {fileID: 2100000, guid: cd2487383f3ecb84a950a3426dd92ca7, type: 2}
     - target: {fileID: 4590821631456672, guid: 63d293d8d9b22af4eb3a41f61a9d3538, type: 2}
       propertyPath: m_LocalScale.x
       value: 0.59999996

SampleScenes/HDTest/SkyFogTest/Lit_Transparent_Add.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Transparent_Add
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ADD _ENABLE_FOG _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_ADD _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
+    _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _DstBlend: 1
     - _EmissiveColorMode: 1
     - _EmissiveIntensity: 0
+    - _EnableBlendModeAccurateLighting: 1
+    - _EnableBlendModePreserveSpecularLighting: 1
+    - _EnableFogOnTransparent: 1
+    - _EnableTransparentFog: 1
     - _EnableVertexDisplacement: 0
     - _EnableWind: 0
     - _HeightAmplitude: 0.01

SampleScenes/HDTest/SkyFogTest/Lit_Transparent_Add_NoFog.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Transparent_Add_NoFog
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ADD _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_ADD _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLEFOGONTRANSPARENT_OFF
+    _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _DstBlend: 1
     - _EmissiveColorMode: 1
     - _EmissiveIntensity: 0
+    - _EnableBlendModeAccurateLighting: 1
+    - _EnableBlendModePreserveSpecularLighting: 1
+    - _EnableFogOnTransparent: 0
+    - _EnableTransparentFog: 0
     - _EnableVertexDisplacement: 0
     - _EnableWind: 0
     - _HeightAmplitude: 0.01

SampleScenes/HDTest/SkyFogTest/Lit_Transparent_Alpha.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Transparent_Alpha
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _ENABLE_FOG _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
+    _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _DstBlend: 10
     - _EmissiveColorMode: 1
     - _EmissiveIntensity: 0
+    - _EnableBlendModeAccurateLighting: 1
+    - _EnableBlendModePreserveSpecularLighting: 1
+    - _EnableFogOnTransparent: 1
+    - _EnableTransparentFog: 1
     - _EnableVertexDisplacement: 0
     - _EnableWind: 0
     - _HeightAmplitude: 0.01
-    - _IOR: 2.179
+    - _IOR: 1
     - _InitialBend: 1
     - _InvTilingScale: 1
     - _LinkDetailsWithBase: 1

SampleScenes/HDTest/SkyFogTest/Lit_Transparent_Multiply.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Transparent_Multiply
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _BLENDMODE_MULTIPLY _ENABLE_FOG _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_MULTIPLY _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
+    _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _DstBlend: 0
     - _EmissiveColorMode: 1
     - _EmissiveIntensity: 0
+    - _EnableBlendModeAccurateLighting: 1
+    - _EnableBlendModePreserveSpecularLighting: 1
+    - _EnableFogOnTransparent: 1
+    - _EnableTransparentFog: 1
     - _EnableVertexDisplacement: 0
     - _EnableWind: 0
     - _HeightAmplitude: 0.01

SampleScenes/HDTest/SkyFogTest/Lit_Transparent_PreMultipliedAlpha.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Lit_Transparent_PreMultipliedAlpha
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _BLENDMODE_PRE_MULTIPLY _ENABLE_FOG _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _BLENDMODE_PRE_MULTIPLY
+    _ENABLE_FOG_ON_TRANSPARENT _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _DstBlend: 10
     - _EmissiveColorMode: 1
     - _EmissiveIntensity: 0
+    - _EnableBlendModeAccurateLighting: 1
+    - _EnableBlendModePreserveSpecularLighting: 1
+    - _EnableFogOnTransparent: 1
+    - _EnableTransparentFog: 1
     - _EnableVertexDisplacement: 0
     - _EnableWind: 0
     - _HeightAmplitude: 0.01

SampleScenes/HDTest/SkyFogTest/Rough_Refraction_Transparent.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Rough_Refraction_Transparent
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _ENABLE_FOG _NORMALMAP_TANGENT_SPACE _REFRACTION_THINPLANE
-    _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLE_FOG_ON_TRANSPARENT
+    _NORMALMAP_TANGENT_SPACE _REFRACTION_THICKPLANE _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _DstBlend: 10
     - _EmissiveColorMode: 1
     - _EmissiveIntensity: 0
+    - _EnableBlendModeAccurateLighting: 1
+    - _EnableBlendModePreserveSpecularLighting: 1
+    - _EnableFogOnTransparent: 1
+    - _EnableTransparentFog: 1
     - _EnableVertexDisplacement: 0
     - _EnableWind: 0
     - _HeightAmplitude: 0.01
-    - _IOR: 1.631
+    - _IOR: 1.66
     - _InitialBend: 1
     - _InvTilingScale: 1
     - _LinkDetailsWithBase: 1
     - _PPDPrimitiveWidth: 1
     - _PerPixelDisplacementObjectScale: 1
     - _PreRefractionPass: 0
-    - _RefractionMode: 3
+    - _RefractionMode: 1
     - _ShiverDirectionality: 0.5
     - _ShiverDrag: 0.2
     - _Smoothness: 1
     - _ZTestMode: 8
     - _ZWrite: 0
     m_Colors:
-    - _BaseColor: {r: 1, g: 0, b: 0, a: 0.741}
+    - _BaseColor: {r: 1, g: 0, b: 0, a: 1}
-    - _TransmittanceColor: {r: 1, g: 1, b: 1, a: 1}
+    - _TransmittanceColor: {r: 0.48820537, g: 0.86764705, b: 0.3062283, a: 1}
     - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
     - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

SampleScenes/HDTest/SkyFogTest/Unlit_Transparent_Add.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Unlit_Transparent_Add
   m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ADD _ENABLE_FOG _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_ADD _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _EmissiveColorMode: 1
     - _EmissiveIntensity: 0
     - _EnableFog: 1
+    - _EnableFogOnTransparent: 1
+    - _EnableTransparentFog: 1
     - _EnableVertexDisplacement: 0
     - _EnableWind: 0
     - _HeightAmplitude: 0.01

SampleScenes/HDTest/SkyFogTest/Unlit_Transparent_Add_NoFog.mat

     - _EmissiveColorMode: 1
     - _EmissiveIntensity: 0
     - _EnableFog: 0
+    - _EnableFogOnTransparent: 0
+    - _EnableTransparentFog: 0
     - _EnableVertexDisplacement: 0
     - _EnableWind: 0
     - _HeightAmplitude: 0.01

SampleScenes/HDTest/SkyFogTest/Unlit_Transparent_Alpha.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Unlit_Transparent_Alpha
   m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3}
-  m_ShaderKeywords: _BLENDMODE_ALPHA _ENABLE_FOG _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_ALPHA _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _EmissiveColorMode: 1
     - _EmissiveIntensity: 0
     - _EnableFog: 1
+    - _EnableFogOnTransparent: 1
+    - _EnableTransparentFog: 1
     - _EnableVertexDisplacement: 0
     - _EnableWind: 0
     - _HeightAmplitude: 0.01

SampleScenes/HDTest/SkyFogTest/Unlit_Transparent_Multiply.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Unlit_Transparent_Multiply
   m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3}
-  m_ShaderKeywords: _BLENDMODE_MULTIPLY _ENABLE_FOG _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_MULTIPLY _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _EmissiveColorMode: 1
     - _EmissiveIntensity: 0
     - _EnableFog: 1
+    - _EnableFogOnTransparent: 1
+    - _EnableTransparentFog: 1
     - _EnableVertexDisplacement: 0
     - _EnableWind: 0
     - _HeightAmplitude: 0.01

SampleScenes/HDTest/SkyFogTest/Unlit_Transparent_PreMultipliedAlpha.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: Unlit_Transparent_PreMultipliedAlpha
   m_Shader: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3}
-  m_ShaderKeywords: _BLENDMODE_PRE_MULTIPLY _ENABLE_FOG _SURFACE_TYPE_TRANSPARENT
+  m_ShaderKeywords: _BLENDMODE_PRE_MULTIPLY _ENABLE_FOG_ON_TRANSPARENT _SURFACE_TYPE_TRANSPARENT
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _EmissiveColorMode: 1
     - _EmissiveIntensity: 0
     - _EnableFog: 1
+    - _EnableFogOnTransparent: 1
+    - _EnableTransparentFog: 1
     - _EnableVertexDisplacement: 0
     - _EnableWind: 0
     - _HeightAmplitude: 0.01

ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader

         [HideInInspector] _CullMode("__cullmode", Float) = 2.0
         [HideInInspector] _ZTestMode("_ZTestMode", Int) = 8
 
-        [ToggleOff] _EnableFog ("Enable Fog", Float) = 1.0
+        [ToggleOff] _EnableFogOnTransparent("Enable Fog", Float) = 1.0
+        [ToggleOff] _EnableBlendModePreserveSpecularLighting("Enable Blend Mode Preserve Specular Lighting", Float) = 1.0
 
         [ToggleOff] _DoubleSidedEnable("Double sided enable", Float) = 0.0
         [Enum(None, 0, Mirror, 1, Flip, 2)] _DoubleSidedNormalMode("Double sided normal mode", Float) = 1
     #pragma shader_feature _HEIGHT_BASED_BLEND
     #pragma shader_feature _ _LAYEREDLIT_3_LAYERS _LAYEREDLIT_4_LAYERS
 
+    // Keyword for transparent
-
-    // This feature is only for transparent Lit
-    #pragma shader_feature _ENABLE_FOG
+    #pragma shader_feature _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
+    #pragma shader_feature _ENABLE_FOG_ON_TRANSPARENT
 
     #pragma multi_compile LIGHTMAP_OFF LIGHTMAP_ON
     #pragma multi_compile DIRLIGHTMAP_OFF DIRLIGHTMAP_COMBINED

ScriptableRenderPipeline/HDRenderPipeline/Material/LayeredLit/LayeredLitTessellation.shader

         [HideInInspector] _CullMode("__cullmode", Float) = 2.0
         [HideInInspector] _ZTestMode("_ZTestMode", Int) = 8
 
-        [ToggleOff] _EnableFog ("Enable Fog", Float) = 1.0
+        [ToggleOff] _EnableFogOnTransparent("Enable Fog", Float) = 1.0
+        [ToggleOff] _EnableBlendModePreserveSpecularLighting("Enable Blend Mode Preserve Specular Lighting", Float) = 1.0
 
         [ToggleOff] _DoubleSidedEnable("Double sided enable", Float) = 0.0
         [Enum(None, 0, Mirror, 1, Flip, 2)] _DoubleSidedNormalMode("Double sided normal mode", Float) = 1
     #pragma shader_feature _HEIGHT_BASED_BLEND
     #pragma shader_feature _ _LAYEREDLIT_3_LAYERS _LAYEREDLIT_4_LAYERS
 
+    // Keyword for transparent
-
-    // This feature is only for transparent Lit
-    #pragma shader_feature _ENABLE_FOG
+    #pragma shader_feature _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
+    #pragma shader_feature _ENABLE_FOG_ON_TRANSPARENT
 
     #pragma multi_compile LIGHTMAP_OFF LIGHTMAP_ON
     #pragma multi_compile DIRLIGHTMAP_OFF DIRLIGHTMAP_COMBINED

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

             public static string InputsText = "Inputs";
 
             public static GUIContent baseColorText = new GUIContent("Base Color + Opacity", "Albedo (RGB) and Opacity (A)");
-            public static GUIContent baseColorSmoothnessText = new GUIContent("Base Color + Smoothness", "Albedo (RGB) and Smoothness (A)");
+            public static GUIContent baseColorRefractionMaskText = new GUIContent("Base Color + RefractionMask", "Albedo (RGB) and Refraction mask (A)");
 
             public static GUIContent smoothnessMapChannelText = new GUIContent("Smoothness Source", "Smoothness texture and channel");
             public static GUIContent metallicText = new GUIContent("Metallic", "Metallic scale factor");
 
             EditorGUI.indentLevel++;
 
-            m_MaterialEditor.TexturePropertySingleLine(Styles.baseColorText, baseColorMap[layerIndex], baseColor[layerIndex]);
+            bool refractionEnable = refractionMode.floatValue > 0.0f && preRefractionPass.floatValue == 0.0f;
+
+            m_MaterialEditor.TexturePropertySingleLine(refractionEnable ? Styles.baseColorRefractionMaskText : Styles.baseColorText, baseColorMap[layerIndex], baseColor[layerIndex]);
 
             if ( materialID == null || // Will be the case for Layered materials where we only support standard and the parameter does not exist
                 (Lit.MaterialId)materialID.floatValue == Lit.MaterialId.LitStandard || (Lit.MaterialId)materialID.floatValue == Lit.MaterialId.LitAniso)

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl

-//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
 // SurfaceData and BSDFData
 //-----------------------------------------------------------------------------
 
 #endif
 
 // Define refraction keyword helpers
-#if defined(_REFRACTION_THINPLANE) || defined(_REFRACTION_THICKPLANE) || defined(_REFRACTION_THICKSPHERE)
-    #define HAS_REFRACTION
-#else
-    #undef HAS_REFRACTION
-#endif
+#define HAS_REFRACTION (defined(_REFRACTION_THINPLANE) || defined(_REFRACTION_THICKPLANE) || defined(_REFRACTION_THICKSPHERE))
 
 // In case we pack data uint16 buffer we need to change the output render target format to uint16
 // TODO: Is there a way to automate these output type based on the format declare in lit.cs ?
         FillMaterialIdClearCoatData(surfaceData.coatNormalWS, surfaceData.coatCoverage, surfaceData.coatIOR, bsdfData);
     }
 
-#if defined(_REFRACTION_THINPLANE) || defined(_REFRACTION_THICKPLANE) || defined(_REFRACTION_THICKSPHERE)
+#if HAS_REFRACTION
     // Note: Will override thickness of SSS's property set
     FillMaterialIdTransparencyData(
         surfaceData.ior, surfaceData.transmittanceColor, surfaceData.atDistance, surfaceData.thickness, surfaceData.refractionMask,
     specularLighting = float3(0.0, 0.0, 0.0);
     weight = float2(0.0, 0.0);
 
-#ifdef HAS_REFRACTION
+#if HAS_REFRACTION
     // Refraction process:
     //  1. Depending on the shape model, we calculate the refracted point in world space and the optical depth
     //  2. We calculate the screen space position of the refracted point
     // Beer-Lamber law for absorption
     float3 transmittance = exp(-bsdfData.absorptionCoefficient * opticalDepth);
     diffuseLighting *= transmittance;
-#endif
+#endif // HAS_REFRACTION
 }
 
 //-----------------------------------------------------------------------------

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader

         [HideInInspector] _CullMode("__cullmode", Float) = 2.0
         [HideInInspector] _ZTestMode("_ZTestMode", Int) = 8
 
-        [ToggleOff] _EnableFog ("Enable Fog", Float) = 1.0
+        [ToggleOff] _EnableFogOnTransparent("Enable Fog", Float) = 1.0
+        [ToggleOff] _EnableBlendModePreserveSpecularLighting("Enable Blend Mode Preserve Specular Lighting", Float) = 1.0
 
         [ToggleOff] _DoubleSidedEnable("Double sided enable", Float) = 0.0
         [Enum(None, 0, Mirror, 1, Flip, 2)] _DoubleSidedNormalMode("Double sided normal mode", Float) = 1
     #pragma shader_feature _THICKNESSMAP
     #pragma shader_feature _SPECULARCOLORMAP
 
+    // Keyword for transparent
-
-    // This feature is only for transparent Lit
-    #pragma shader_feature _ENABLE_FOG
+    #pragma shader_feature _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
+    #pragma shader_feature _ENABLE_FOG_ON_TRANSPARENT
 
     // MaterialId are used as shader feature to allow compiler to optimize properly
     // Note _MATID_STANDARD is not define as there is always the default case "_". We assign default as _MATID_STANDARD, so we never test _MATID_STANDARD

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitDataInternal.hlsl

     surfaceData.specularColor *= SAMPLE_UVMAPPING_TEXTURE2D(_SpecularColorMap, sampler_SpecularColorMap, layerTexCoord.base).rgb;
 #endif
 
-#ifdef HAS_REFRACTION
+#if HAS_REFRACTION
-    surfaceData.refractionMask = 1.0 - alpha;
-    alpha = 1.0; // Transparency is done with refraction, not blending
+    // Rough refraction don't use opacity. Instead we use opacity as a refraction mask. 
+    surfaceData.refractionMask = alpha;
+    alpha = 1.0;
-    surfaceData.refractionMask = 0.0;
+    surfaceData.refractionMask = 1.0;
 #endif
 
     surfaceData.coatNormalWS    = input.worldToTangent[2].xyz; // Assign vertex normal

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitTessellation.shader

         [HideInInspector] _CullMode("__cullmode", Float) = 2.0
         [HideInInspector] _ZTestMode("_ZTestMode", Int) = 8
 
-        [ToggleOff] _EnableFog ("Enable Fog", Float) = 1.0
+        [ToggleOff] _EnableFogOnTransparent("Enable Fog", Float) = 1.0
+        [ToggleOff] _EnableBlendModePreserveSpecularLighting("Enable Blend Mode Preserve Specular Lighting", Float) = 1.0
 
         [ToggleOff] _DoubleSidedEnable("Double sided enable", Float) = 0.0
         [Enum(None, 0, Mirror, 1, Flip, 2)] _DoubleSidedNormalMode("Double sided normal mode", Float) = 1
     #pragma shader_feature _THICKNESSMAP
     #pragma shader_feature _SPECULARCOLORMAP
 
+    // Keyword for transparent
-
-    // This feature is only for transparent Lit
-    #pragma shader_feature _ENABLE_FOG
+    #pragma shader_feature _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
+    #pragma shader_feature _ENABLE_FOG_ON_TRANSPARENT
 
     // MaterialId are used as shader feature to allow compiler to optimize properly
     // Note _MATID_STANDARD is not define as there is always the default case "_". We assign default as _MATID_STANDARD, so we never test _MATID_STANDARD

ScriptableRenderPipeline/HDRenderPipeline/Material/Material.hlsl

 #include "../../Core/ShaderLibrary/ImageBasedLighting.hlsl"
 #include "../Sky/AtmosphericScattering/AtmosphericScattering.hlsl"
 
-// Guidelines
-// .Shader need to define _SURFACE_TYPE_TRANSPARENT if they use a transparent material
-// Also when transparent material object use a blend mode, it must define the blend mode (Note: Rough Refraction don't use blend mode)
-// _BLENDMODE_ALPHA, _BLENDMODE_ADD, _BLENDMODE_MULTIPLY, (_BLENDMODE_PRE_MULTIPLY)
+// Guidelines for Material Keyword.
+// There is a set of Material Keyword that a HD shaders must define (or not define). We call them system KeyWord.
+// .Shader need to define:
+// - _SURFACE_TYPE_TRANSPARENT if they use a transparent material
+// - _BLENDMODE_ALPHA, _BLENDMODE_ADD, _BLENDMODE_MULTIPLY, _BLENDMODE_PRE_MULTIPLY for blend mode
+// - _BLENDMODE_PRESERVE_SPECULAR_LIGHTING for correct lighting when blend mode are use with a Lit material
+// - _ENABLE_FOG_ON_TRANSPARENT if fog is enable on transparent surface
 
 //-----------------------------------------------------------------------------
 // Fog sampling function for materials
 {
     float4 result = inputColor;
 
-#if defined(_SURFACE_TYPE_TRANSPARENT) && defined(_ENABLE_FOG)
+#ifdef _ENABLE_FOG_ON_TRANSPARENT
-#if defined(_BLENDMODE_ALPHA)
+    #if defined(_BLENDMODE_ALPHA)
-#elif defined(_BLENDMODE_ADD)
+    #elif defined(_BLENDMODE_ADD)
-#elif defined(_BLENDMODE_MULTIPLY)
+    #elif defined(_BLENDMODE_MULTIPLY)
-#elif defined(_BLENDMODE_PRE_MULTIPLY)
+    #elif defined(_BLENDMODE_PRE_MULTIPLY)
-#endif
+    #endif
 
 #else
     // Evaluation of fog for opaque objects is currently done in a full screen pass independent from any material parameters.

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

             public static GUIContent alphaCutoffShadowText = new GUIContent("Alpha Cutoff Shadow", "Threshold for alpha cutoff in case of shadow pass");
             public static GUIContent alphaCutoffPrepassText = new GUIContent("Alpha Cutoff Prepass", "Threshold for alpha cutoff in case of depth prepass");
             public static GUIContent transparentDepthPrepassEnableText = new GUIContent("Enable transparent depth prepass", "It allow to ");
-            public static GUIContent enableFogText = new GUIContent("Enable Fog");
+            public static GUIContent enableTransparentFogText = new GUIContent("Enable fog", "Enable fog on transparent material");
+            public static GUIContent enableBlendModePreserveSpecularLightingText = new GUIContent("Blend preserve specular lighting", "Blend mode will only affect diffuse lighting, allowing correct specular lighting (reflection) on transparent object");
 
             public static GUIContent doubleSidedEnableText = new GUIContent("Double Sided", "This will render the two face of the objects (disable backface culling) and flip/mirror normal");
             public static GUIContent distortionEnableText = new GUIContent("Distortion", "Enable distortion on this shader");
         protected const string kDistortionBlurRemapMax = "_DistortionBlurRemapMax";
         protected MaterialProperty preRefractionPass = null;
         protected const string kPreRefractionPass = "_PreRefractionPass";
-        protected MaterialProperty enableFog = null;
-        protected const string kEnableFog = "_EnableFog";
+        protected MaterialProperty enableFogOnTransparent = null;
+        protected const string kEnableFogOnTransparent = "_EnableFogOnTransparent";
+        protected MaterialProperty enableBlendModePreserveSpecularLighting = null;
+        protected const string kEnableBlendModePreserveSpecularLighting = "_EnableBlendModePreserveSpecularLighting";
+        
 
         // See comment in LitProperties.hlsl
         const string kEmissionColor = "_EmissionColor";
 
         protected virtual void FindBaseMaterialProperties(MaterialProperty[] props)
         {
+            // Everything is optional (except surface type) so users that derive from this class can decide what they expose or not
-            alphaCutoffEnable = FindProperty(kAlphaCutoffEnabled, props);
-            alphaCutoff = FindProperty(kAlphaCutoff, props);
+            alphaCutoffEnable = FindProperty(kAlphaCutoffEnabled, props, false);
+            alphaCutoff = FindProperty(kAlphaCutoff, props, false);
-            doubleSidedEnable = FindProperty(kDoubleSidedEnable, props);
-            blendMode = FindProperty(kBlendMode, props);
+            doubleSidedEnable = FindProperty(kDoubleSidedEnable, props, false);
+            blendMode = FindProperty(kBlendMode, props, false);
 
             // Distortion is optional
             distortionEnable = FindProperty(kDistortionEnable, props, false);
             distortionBlurRemapMax = FindProperty(kDistortionBlurRemapMax, props, false);
             preRefractionPass = FindProperty(kPreRefractionPass, props, false);
 
-            enableFog = FindProperty(kEnableFog, props, false);
+            enableFogOnTransparent = FindProperty(kEnableFogOnTransparent, props, false);
+            enableBlendModePreserveSpecularLighting = FindProperty(kEnableBlendModePreserveSpecularLighting, props, false);            
         }
 
         void SurfaceTypePopup()
             EditorGUI.indentLevel++;
 
             SurfaceTypePopup();
-            if ((SurfaceType)surfaceType.floatValue == SurfaceType.Transparent)
-            {
-                if (showBlendModePopup)
-                    BlendModePopup();
+            if (blendMode != null && showBlendModePopup)
+                BlendModePopup();
-                EditorGUI.indentLevel++;
-                m_MaterialEditor.ShaderProperty(enableFog, StylesBaseUnlit.enableFogText);
+            EditorGUI.indentLevel++;
+            if (enableBlendModePreserveSpecularLighting != null && blendMode != null && showBlendModePopup)
+                m_MaterialEditor.ShaderProperty(enableBlendModePreserveSpecularLighting, StylesBaseUnlit.enableBlendModePreserveSpecularLightingText);
+            if (enableFogOnTransparent != null)
+                m_MaterialEditor.ShaderProperty(enableFogOnTransparent, StylesBaseUnlit.enableTransparentFogText);
+            if (preRefractionPass != null)
-                EditorGUI.indentLevel--;
-            }
-            m_MaterialEditor.ShaderProperty(alphaCutoffEnable, StylesBaseUnlit.alphaCutoffEnableText);
-            if (alphaCutoffEnable.floatValue == 1.0f)
+            EditorGUI.indentLevel--;
+
+            if (alphaCutoffEnable != null)
+                m_MaterialEditor.ShaderProperty(alphaCutoffEnable, StylesBaseUnlit.alphaCutoffEnableText);
+
+            if (alphaCutoffEnable != null && alphaCutoffEnable.floatValue == 1.0f)
-                // This allow to get a better sorting (with prepass), better shadow (better silouhette fidelity) etc...
+                // This allow to get a better sorting (with prepass), better shadow (better silhouettes fidelity) etc...
                 if ((SurfaceType)surfaceType.floatValue == SurfaceType.Transparent)
                 {
                     if (alphaCutoffShadow != null)
                 EditorGUI.indentLevel--;
             }
             // This function must finish with double sided option (see LitUI.cs)
-            m_MaterialEditor.ShaderProperty(doubleSidedEnable, StylesBaseUnlit.doubleSidedEnableText);
+            if (doubleSidedEnable != null)
+                m_MaterialEditor.ShaderProperty(doubleSidedEnable, StylesBaseUnlit.doubleSidedEnableText);
 
             EditorGUI.indentLevel--;
         }
         // All Setup Keyword functions must be static. It allow to create script to automatically update the shaders with a script if ocde change
         static public void SetupBaseUnlitKeywords(Material material)
         {
-            bool alphaTestEnable = material.GetFloat(kAlphaCutoffEnabled) > 0.0f;
+            bool alphaTestEnable = material.HasProperty(kAlphaCutoffEnabled) && material.GetFloat(kAlphaCutoffEnabled) > 0.0f;
+            SetKeyword(material, "_ALPHATEST_ON", alphaTestEnable);
+
-            BlendMode blendMode = (BlendMode)material.GetFloat(kBlendMode);
-
+
+            bool enableBlendModePreserveSpecularLighting = material.HasProperty(kEnableBlendModePreserveSpecularLighting) && material.GetFloat(kEnableBlendModePreserveSpecularLighting) > 0.0f;
+            SetKeyword(material, "_BLENDMODE_PRESERVE_SPECULAR_LIGHTING", enableBlendModePreserveSpecularLighting);
 
             // These need to always been set either with opaque or transparent! So a users can switch to opaque and remove the keyword correctly
             SetKeyword(material, "_BLENDMODE_ALPHA", false);
                 var isPrePass = material.HasProperty(kPreRefractionPass) && material.GetFloat(kPreRefractionPass) > 0.0f;
                 material.renderQueue = (int)(isPrePass ? HDRenderQueue.PreRefraction : HDRenderQueue.Transparent);
 
-                SetKeyword(material, "_BLENDMODE_ALPHA", BlendMode.Alpha == blendMode);
-                SetKeyword(material, "_BLENDMODE_ADD", BlendMode.Additive == blendMode);
-                SetKeyword(material, "_BLENDMODE_MULTIPLY", BlendMode.Multiplicative == blendMode);
-                SetKeyword(material, "_BLENDMODE_PRE_MULTIPLY", BlendMode.PremultipliedAlpha == blendMode);
+                if (material.HasProperty(kBlendMode))
+                {
+                    BlendMode blendMode = (BlendMode)material.GetFloat(kBlendMode);
-                switch (blendMode)
-                {
-                    case BlendMode.Alpha:
-                        material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.SrcAlpha);
-                        material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha);
-                        break;
+                    SetKeyword(material, "_BLENDMODE_ALPHA", BlendMode.Alpha == blendMode);
+                    SetKeyword(material, "_BLENDMODE_ADD", BlendMode.Additive == blendMode);
+                    SetKeyword(material, "_BLENDMODE_MULTIPLY", BlendMode.Multiplicative == blendMode);
+                    SetKeyword(material, "_BLENDMODE_PRE_MULTIPLY", BlendMode.PremultipliedAlpha == blendMode);
+
+                    switch (blendMode)
+                    {
+                        case BlendMode.Alpha:
+                            material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.SrcAlpha);
+                            material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha);
+                            break;
-                    case BlendMode.Additive:
-                        material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.One);
-                        material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.One);
-                        break;
+                        case BlendMode.Additive:
+                            material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.One);
+                            material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.One);
+                            break;
-                    case BlendMode.Multiplicative:
-                        material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.DstColor);
-                        material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.Zero);
-                        break;
+                        case BlendMode.Multiplicative:
+                            material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.DstColor);
+                            material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.Zero);
+                            break;
-                    case BlendMode.PremultipliedAlpha:
-                        material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.One);
-                        material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha);
-                        break;
+                        case BlendMode.PremultipliedAlpha:
+                            material.SetInt("_SrcBlend", (int)UnityEngine.Rendering.BlendMode.One);
+                            material.SetInt("_DstBlend", (int)UnityEngine.Rendering.BlendMode.OneMinusSrcAlpha);
+                            break;
+                    }
-            bool doubleSidedEnable = material.GetFloat(kDoubleSidedEnable) > 0.0f;
+            bool doubleSidedEnable = material.HasProperty(kDoubleSidedEnable) && material.GetFloat(kDoubleSidedEnable) > 0.0f;
             if (doubleSidedEnable)
             {
                 material.SetInt("_CullMode", (int)UnityEngine.Rendering.CullMode.Off);
                 material.SetInt("_CullMode", (int)UnityEngine.Rendering.CullMode.Back);
             }
-
-            SetKeyword(material, "_ALPHATEST_ON", alphaTestEnable);
-            bool fogEnabled = material.GetFloat(kEnableFog) > 0.0f;
-            SetKeyword(material, "_ENABLE_FOG", fogEnabled);
+
+            bool fogEnabled = material.HasProperty(kEnableFogOnTransparent) && material.GetFloat(kEnableFogOnTransparent) > 0.0f && surfaceType == SurfaceType.Transparent;
+            SetKeyword(material, "_ENABLE_FOG_ON_TRANSPARENT", fogEnabled);
 
             if (material.HasProperty(kDistortionEnable))
             {
 
                 var distortionBlendMode = material.GetInt(kDistortionBlendMode);
                 switch (distortionBlendMode)
-
-                    {
                         material.SetInt("_DistortionSrcBlend", (int)UnityEngine.Rendering.BlendMode.One);
                         material.SetInt("_DistortionDstBlend", (int)UnityEngine.Rendering.BlendMode.One);
 
                             break;
-            }
+
                     case 1: // Multiply
                         material.SetInt("_DistortionSrcBlend", (int)UnityEngine.Rendering.BlendMode.DstColor);
                         material.SetInt("_DistortionDstBlend", (int)UnityEngine.Rendering.BlendMode.Zero);

ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/ShaderPass/UnlitSharePass.hlsl

 
 #define ATTRIBUTES_NEED_TEXCOORD0
 
-#if defined(_ENABLE_FOG)
+#if defined(_ENABLE_FOG_ON_TRANSPARENT)
 #define VARYINGS_NEED_POSITION_WS
 #endif
 

ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Unlit.shader

         [HideInInspector] _CullMode("__cullmode", Float) = 2.0
         [HideInInspector] _ZTestMode("_ZTestMode", Int) = 8
 
+        [ToggleOff] _EnableFogOnTransparent("Enable Fog", Float) = 0.0
-
-        [ToggleOff] _EnableFog ("Enable Fog", Float) = 0.0
 
         // Caution: C# code in BaseLitUI.cs call LightmapEmissionFlagsProperty() which assume that there is an existing "_EmissionColor"
         // value that exist to identify if the GI emission need to be enabled.
 
     #pragma shader_feature _EMISSIVE_COLOR_MAP
 
+    // Keyword for transparent
-
-    // This feature is only for transparent Unlit
-    #pragma shader_feature _ENABLE_FOG
+    #pragma shader_feature _ENABLE_FOG_ON_TRANSPARENT
 
     //-------------------------------------------------------------------------------------
     // Define

ScriptableRenderPipeline/HDRenderPipeline/RenderPipelineResources/DefaultHDMaterial.mat

   m_PrefabInternal: {fileID: 0}
   m_Name: DefaultHDMaterial
   m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
-  m_ShaderKeywords: _NORMALMAP_TANGENT_SPACE
+  m_ShaderKeywords: _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _NORMALMAP_TANGENT_SPACE
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
     - _DstBlend: 0
     - _EmissiveColorMode: 1
     - _EmissiveIntensity: 0
+    - _EnableBlendModeAccurateLighting: 1
+    - _EnableBlendModePreserveSpecularLighting: 1
+    - _EnableFogOnTransparent: 1
+    - _EnableTransparentFog: 1
     - _EnableWind: 0
     - _GlossMapScale: 1
     - _Glossiness: 0.5

ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/ShaderPassForward.hlsl

 
 float4 ApplyBlendMode(float3 diffuseLighting, float3 specularLighting, float opacity)
 {
-    return float4(diffuseLighting + specularLighting, opacity);
-}
+    // ref: http://advances.realtimerendering.com/other/2016/naughty_dog/NaughtyDog_TechArt_Final.pdf
+    // Lit transparent object should have reflection and tramission.
+    // Transmission when not using "rough refraction mode" (with fetch in preblured background) is handled with blend mode.
+    // However reflection should not be affected by blend mode. For example a glass should still display reflection and not lose the highlight when blend
+    // This is the purpose of following function, "Cancel" the blend mode effect on the specular lighting but not on the diffuse lighting
+#ifdef _BLENDMODE_PRESERVE_SPECULAR_LIGHTING
-// ref: http://advances.realtimerendering.com/other/2016/naughty_dog/index.html
-// Lit transparent object should have reflection and tramission.
-// Transmission when not using "rough refraction mode" (with fetch in preblured background) is handled with blend mode.
-// However reflection should not be affected by blend mode. For example a glass should still display reflection and not lose the highlight when blend
-// This is the purpose of following function, "Cancel" the blend mode effect on the specular lighting but not on the diffuse lighting
-float4 ApplyBlendModeAccurateLighting(float3 diffuseLighting, float3 specularLighting, float opacity)
-{
-#ifdef _BLENDMODE_ALPHA
+    #ifdef _BLENDMODE_ALPHA
-#elif defined(_BLENDMODE_ADD) || defined(_BLENDMODE_PRE_MULTIPLY)
+    #elif defined(_BLENDMODE_ADD) || defined(_BLENDMODE_PRE_MULTIPLY)
+    #else
+    return float4(diffuseLighting + specularLighting, opacity);
+    #endif
+
-    return ApplyBlendMode(diffuseLighting, specularLighting, opacity);
+
+    return float4(diffuseLighting + specularLighting, opacity);
+
 #endif
 }
 
         float3 bakeDiffuseLighting = GetBakedDiffuseLigthing(surfaceData, builtinData, bsdfData, preLightData);
         LightLoop(V, posInput, preLightData, bsdfData, bakeDiffuseLighting, featureFlags, diffuseLighting, specularLighting);
 
-        outColor = ApplyBlendModeAccurateLighting(diffuseLighting, specularLighting, builtinData.opacity);
+        outColor = ApplyBlendMode(diffuseLighting, specularLighting, builtinData.opacity);
         outColor = EvaluateAtmosphericScattering(posInput, outColor);
     }
 

ScriptableRenderPipeline/HDRenderPipeline/Sky/AtmosphericScattering/AtmosphericScattering.hlsl

 float4  _ExpFogParameters;
 CBUFFER_END
 
-#define _MipFogNear         _MipFogParameters.x
-#define _MipFogFar          _MipFogParameters.y
-#define _MipFogMaxMip       _MipFogParameters.z
+#define _MipFogNear             _MipFogParameters.x
+#define _MipFogFar              _MipFogParameters.y
+#define _MipFogMaxMip           _MipFogParameters.z
-#define _LinearFogStart     _LinearFogParameters.x
-#define _LinearFogEnd       _LinearFogParameters.y
-#define _LinearFogOoRange   _LinearFogParameters.z
-#define _LinearFogDensity   _LinearFogParameters.w
+#define _LinearFogStart         _LinearFogParameters.x
+#define _LinearFogEnd           _LinearFogParameters.y
+#define _LinearFogOneOverRange  _LinearFogParameters.z
+#define _LinearFogDensity       _LinearFogParameters.w
-#define _ExpFogDistance     _ExpFogParameters.x
-#define _ExpFogDensity      _ExpFogParameters.y
+#define _ExpFogDistance         _ExpFogParameters.x
+#define _ExpFogDensity          _ExpFogParameters.y
 
 float3 GetFogColor(PositionInputs posInput)
 {
     else if (_AtmosphericScatteringType == FOGTYPE_LINEAR)
     {
         float3 fogColor = GetFogColor(posInput);
-        float fogFactor = _LinearFogDensity * saturate((posInput.depthVS - _LinearFogStart) * _LinearFogOoRange);
+        float fogFactor = _LinearFogDensity * saturate((posInput.depthVS - _LinearFogStart) * _LinearFogOneOverRange);
         return float4(fogColor, fogFactor);
     }
     else // NONE
 }
 
 
-#endif
+#endif

SampleScenes/HDTest/SkyFogTest/Rough_Refraction_Transparent_No_Fog.mat

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Rough_Refraction_Transparent_No_Fog
+  m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
+  m_ShaderKeywords: _BLENDMODE_ALPHA _BLENDMODE_PRESERVE_SPECULAR_LIGHTING _ENABLEFOGONTRANSPARENT_OFF
+    _NORMALMAP_TANGENT_SPACE _REFRACTION_THICKPLANE _SURFACE_TYPE_TRANSPARENT
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: 3000
+  stringTagMap:
+    RenderType: Transparent
+  disabledShaderPasses:
+  - DistortionVectors
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AnisotropyMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BentNormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DistortionVectorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissiveColorMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _HeightMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MaskMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _NormalMapOS:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecularColorMap:
+        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}
+    - _TangentMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TangentMapOS:
+        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}
+    m_Floats:
+    - _ATDistance: 1
+    - _AlbedoAffectEmissive: 0
+    - _AlphaCutoff: 0.5
+    - _AlphaCutoffEnable: 0
+    - _Anisotropy: 0
+    - _BlendMode: 0
+    - _CoatCoverage: 1
+    - _CoatIOR: 0.5
+    - _CullMode: 2
+    - _DepthOffsetEnable: 0
+    - _DetailAlbedoScale: 1
+    - _DetailNormalScale: 1
+    - _DetailSmoothnessScale: 1
+    - _DisplacementLockObjectScale: 1
+    - _DisplacementLockTilingScale: 1
+    - _DisplacementMode: 0
+    - _DistortionBlendMode: 0
+    - _DistortionBlurBlendMode: 0
+    - _DistortionBlurDstBlend: 1
+    - _DistortionBlurRemapMax: 1
+    - _DistortionBlurRemapMin: 0
+    - _DistortionBlurScale: 1
+    - _DistortionBlurSrcBlend: 1
+    - _DistortionDepthTest: 0
+    - _DistortionDstBlend: 1
+    - _DistortionEnable: 0
+    - _DistortionOnly: 0
+    - _DistortionScale: 1
+    - _DistortionSrcBlend: 1
+    - _DoubleSidedEnable: 0
+    - _DoubleSidedNormalMode: 1
+    - _Drag: 1
+    - _DstBlend: 10
+    - _EmissiveColorMode: 1
+    - _EmissiveIntensity: 0
+    - _EnableBlendModeAccurateLighting: 1
+    - _EnableBlendModePreserveSpecularLighting: 1
+    - _EnableFog: 1
+    - _EnableFogOnTransparent: 0
+    - _EnablePerPixelDisplacement: 0
+    - _EnableSpecularOcclusion: 0
+    - _EnableTransparentFog: 0
+    - _EnableVertexDisplacement: 0
+    - _EnableWind: 0
+    - _HeightAmplitude: 0.01
+    - _HeightCenter: 0.5
+    - _HeightMax: 1
+    - _HeightMin: -1
+    - _IOR: 1.631
+    - _InitialBend: 1
+    - _InvTilingScale: 1
+    - _LinkDetailsWithBase: 1
+    - _MaterialID: 1
+    - _Metallic: 0
+    - _NormalMapSpace: 0
+    - _NormalScale: 1
+    - _PPDLodThreshold: 5
+    - _PPDMaxSamples: 15
+    - _PPDMinSamples: 5
+    - _PPDPrimitiveLength: 1
+    - _PPDPrimitiveWidth: 1
+    - _PerPixelDisplacementObjectScale: 1
+    - _PreRefractionPass: 0
+    - _RefractionMode: 1
+    - _ShiverDirectionality: 0.5
+    - _ShiverDrag: 0.2
+    - _Smoothness: 1
+    - _SmoothnessRemapMax: 1
+    - _SmoothnessRemapMin: 0
+    - _SrcBlend: 5
+    - _StencilRef: 2
+    - _Stiffness: 1
+    - _SubsurfaceProfile: 0
+    - _SubsurfaceRadius: 1
+    - _SurfaceType: 1
+    - _TexWorldScale: 1
+    - _Thickness: 1
+    - _ThicknessMultiplier: 1
+    - _UVBase: 0
+    - _UVDetail: 0
+    - _VertexDisplacementObjectScale: 1
+    - _VertexDisplacementTilingScale: 1
+    - _ZTestMode: 8
+    - _ZWrite: 0
+    m_Colors:
+    - _BaseColor: {r: 1, g: 0, b: 0, a: 1}
+    - _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}
+    - _InvPrimScale: {r: 1, g: 1, b: 0, a: 0}
+    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
+    - _TransmittanceColor: {r: 0.48820543, g: 0.86764705, b: 0.30622834, a: 1}
+    - _UVDetailsMappingMask: {r: 1, g: 0, b: 0, a: 0}
+    - _UVMappingMask: {r: 1, g: 0, b: 0, a: 0}

SampleScenes/HDTest/SkyFogTest/Rough_Refraction_Transparent_No_Fog.mat.meta

+fileFormatVersion: 2
+guid: cd2487383f3ecb84a950a3426dd92ca7
+timeCreated: 1507906791
+licenseType: Pro
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SampleScenes/HDTest/ShadowsTest.meta

-fileFormatVersion: 2
-guid: 37b64947bf0ad024fb931d24f17a52b7
-folderAsset: yes
-timeCreated: 1504864302
-licenseType: Pro
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: