unify applyHeight call

ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl

 // Calculate weights to apply to each layer
 // Caution: This function must not be use for per vertex/pixel displacement, there is a dedicated function for them.
 // This function handle triplanar
-void ComputeLayerWeights(FragInputs input, LayerTexCoord layerTexCoord, float4 inputAlphaMask, float4 blendMasks, out float outWeights[_MAX_LAYER])
+void ComputeLayerWeights(FragInputs input, LayerTexCoord layerTexCoord, float4 inputAlphaMask, float4 blendMasks, float influenceMask, out float outWeights[_MAX_LAYER])
 {
     for (int i = 0; i < _MAX_LAYER; ++i)
     {
     blendMasks.argb = lerp(blendMasks.argb, opacityAsDensity, useOpacityAsDensityParam);
 #endif
 
-    // If no heightmap is set on any layer, we don't need to try and blend them based on height...
-#if defined(_HEIGHT_BASED_BLEND) && LAYERS_HEIGHTMAP_ENABLE
+#if LAYERS_HEIGHTMAP_ENABLE
+    // Height is affected by tiling property and by object scale (depends on option).
+    // Apply scaling from tiling properties (TexWorldScale and tiling from BaseColor)
+    ApplyDisplacementTileScale(height0, height1, height2, height3);
+
+    #if defined(_MAIN_LAYER_INFLUENCE_MODE) && defined(_HEIGHTMAP0)
+    // Add main layer influence if any (simply add main layer add on other layer)
+    // We multiply by the input mask for the first layer (blendMask.a) because if the mask here is black it means that the layer
+    // is not actually underneath any visible layer so we don't want to inherit its height.
+    float influenceMask = blendMasks.a * influenceMask;
+    height1 += height0 * _InheritBaseHeight1 * influenceMask;
+    height2 += height0 * _InheritBaseHeight2 * influenceMask;
+    height3 += height0 * _InheritBaseHeight3 * influenceMask;
+    #endif
+
-    float4 heights = float4(height0, height1, height2, height3);
-    blendMasks = ApplyHeightBlend(heights, blendMasks);
+    #if defined(_HEIGHT_BASED_BLEND)
+    // Modify blendMask to take into account the height of the layer. Higher height should be more visible.
+    blendMasks = ApplyHeightBlend(float4(height0, height1, height2, height3), blendMasks);
+    #endif
 #endif
 
     ComputeMaskWeights(blendMasks, outWeights);
     ZERO_INITIALIZE(LayerTexCoord, layerTexCoord);
     GetLayerTexCoord(input, layerTexCoord);
 
-    float influenceMask = 0.0f;
-#if defined(_MAIN_LAYER_INFLUENCE_MODE)
-    influenceMask = GetInfluenceMask(layerTexCoord);
-#endif
-
     float depthOffset0 = ApplyPerPixelDisplacement0(input, V, layerTexCoord);
     float depthOffset1 = ApplyPerPixelDisplacement1(input, V, layerTexCoord);
     float depthOffset2 = ApplyPerPixelDisplacement2(input, V, layerTexCoord);
 
     // Note: If per pixel displacement is enabled it mean we will fetch again the various heightmaps at the intersection location. Not sure the compiler can optimize.
     float4 blendMasks = GetBlendMask(layerTexCoord, input.color);
+    float influenceMask = 0.0f;
+#if defined(_MAIN_LAYER_INFLUENCE_MODE)
+    influenceMask = GetInfluenceMask(layerTexCoord);
+#endif
-    ComputeLayerWeights(input, layerTexCoord, float4(alpha0, alpha1, alpha2, alpha3), blendMasks, weights);
+    ComputeLayerWeights(input, layerTexCoord, float4(alpha0, alpha1, alpha2, alpha3), blendMasks, influenceMask, weights);
 
     float depthOffset = PROP_BLEND_SCALAR(depthOffset, weights);
 #ifdef _DEPTHOFFSET_ON