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

# Conflicts: # Source/Engine/Physics/Colliders/Collider.h
2025-10-11 00:16:10 +02:00
parent 2bf62cc54f ef2c551cee
commit d426c5b0d9
17 changed files with 105 additions and 31 deletions
--- a/Source/Engine/Physics/Colliders/MeshCollider.cpp
+++ b/Source/Engine/Physics/Colliders/MeshCollider.cpp
@@ -85,13 +85,18 @@ void MeshCollider::DrawPhysicsDebug(RenderView& view)
    }
 }

-void MeshCollider::OnDebugDrawSelected()
+void MeshCollider::OnDebugDrawSelf()
 {
    if (CollisionData && CollisionData->IsLoaded())
    {
        const auto& debugLines = CollisionData->GetDebugLines();
        DEBUG_DRAW_LINES(Span<Float3>(debugLines.Get(), debugLines.Count()), _transform.GetWorld(), Color::GreenYellow, 0, false);
    }
+}
+
+void MeshCollider::OnDebugDrawSelected()
+{
+    OnDebugDrawSelf();

    // Base
    Collider::OnDebugDrawSelected();