Merge remote-tracking branch 'origin/master' into 1.11

# Conflicts:
#	Content/Editor/DebugMaterials/DDGIDebugProbes.flax
#	Source/Engine/Scripting/Scripting.cpp

Source/Shaders/Lighting.hlsl

@@ -122,6 +122,10 @@ float4 GetLighting(float3 viewPos, LightData lightData, GBufferSample gBuffer, f
 
     // Calculate shadow
     ShadowSample shadow = GetShadow(lightData, gBuffer, shadowMask);
+#if !LIGHTING_NO_DIRECTIONAL
+    // Directional shadowing
+    shadow.SurfaceShadow *= NoL;
+#endif
 
     // Calculate attenuation
     if (isRadial)
@@ -135,11 +139,6 @@ float4 GetLighting(float3 viewPos, LightData lightData, GBufferSample gBuffer, f
         shadow.TransmissionShadow *= attenuation;
     }
 
-#if !LIGHTING_NO_DIRECTIONAL
-    // Reduce shadow mapping artifacts
-    shadow.SurfaceShadow *= saturate(NoL * 6.0f - 0.2f) * NoL;
-#endif
-
     BRANCH
     if (shadow.SurfaceShadow + shadow.TransmissionShadow > 0)
     {

Source/Shaders/MaterialCommon.hlsl

@@ -176,6 +176,8 @@ cbuffer ViewData : register(b1)
     float4 TemporalAAJitter;
     float3 LargeWorldsChunkIndex;
     float LargeWorldsChunkSize;
+    float3 ViewPadding0;
+    float UnscaledTimeParam;
 };
 #endif
 

Source/Shaders/SSAO.shader

@@ -56,7 +56,7 @@ static const uint g_numTaps[4] = { 3, 5, 8, 12 };
 #define SSAO_NORMAL_BASED_EDGES_ENABLE_AT_QUALITY_PRESET                (2)         // to disable simply set to 99 or similar
 #define SSAO_NORMAL_BASED_EDGES_DOT_THRESHOLD                           (0.5)       // use 0-0.1 for super-sharp normal-based edges
 //
-#define SSAO_DETAIL_AO_ENABLE_AT_QUALITY_PRESET                         (1)         // whether to use DetailAOStrength; to disable simply set to 99 or similar
+#define SSAO_DETAIL_AO_ENABLE_AT_QUALITY_PRESET                         (99)         // whether to use DetailAOStrength; to disable simply set to 99 or similar
 //
 #define SSAO_DEPTH_MIPS_ENABLE_AT_QUALITY_PRESET                        (99)         // !!warning!! the MIP generation on the C++ side will be enabled on quality preset 2 regardless of this value, so if changing here, change the C++ side too
 #define SSAO_DEPTH_MIPS_GLOBAL_OFFSET                                   (-4.3)      // best noise/quality/performance tradeoff, found empirically