Merge branch 'GoaLitiuM-charcontroller_terrain_fix'

2024-07-18 11:54:54 +02:00
parent 655c377da8 ea45aa9b19
commit 35bbd52f89
1 changed files with 6 additions and 1 deletions
--- a/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
+++ b/Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
@@ -321,7 +321,12 @@ class CharacterControllerHitReportPhysX : public PxUserControllerHitReport
 {
    void onHit(const PxControllerHit& hit, Collision& c)
    {
-        ASSERT_LOW_LAYER(c.ThisActor && c.OtherActor);
+        if (c.ThisActor == nullptr || c.OtherActor == nullptr)
+        {
+            // One of the actors was deleted (eg. via RigidBody destroyed by gameplay) then skip processing this collision
+            return;
+        }
+
        c.Impulse = Vector3::Zero;
        c.ThisVelocity = P2C(hit.dir) * hit.length;
        c.OtherVelocity = Vector3::Zero;