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

# Conflicts: # Source/Engine/Level/Prefabs/Prefab.Apply.cpp
2025-02-27 17:17:02 +01:00
parent 21047ac8ac 7410b506e3
commit dad8c0cd6b
40 changed files with 405 additions and 170 deletions
--- a/Source/Engine/Graphics/Materials/TerrainMaterialShader.cpp
+++ b/Source/Engine/Graphics/Materials/TerrainMaterialShader.cpp
@@ -191,8 +191,11 @@ bool TerrainMaterialShader::Load()
    psDesc.DepthFunc = ComparisonFunc::Less;
    psDesc.HS = nullptr;
    psDesc.DS = nullptr;
-    // TODO: masked terrain materials (depth pass should clip holes)
    psDesc.PS = nullptr;
+    if (EnumHasAnyFlags(_info.UsageFlags, MaterialUsageFlags::UseMask))
+    {
+        psDesc.PS = _shader->GetPS("PS_Depth");
+    }
    _cache.Depth.Init(psDesc);

    return false;