From cde38b024c4d92138eb91ab5d1dc8bb11fc3c0e8 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Sun, 16 Aug 2026 14:33:18 +0200 Subject: [PATCH] Fix terrain patch destruction crash regression --- Source/Engine/Terrain/TerrainPatch.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Engine/Terrain/TerrainPatch.cpp b/Source/Engine/Terrain/TerrainPatch.cpp index d51745e55..a0d742d56 100644 --- a/Source/Engine/Terrain/TerrainPatch.cpp +++ b/Source/Engine/Terrain/TerrainPatch.cpp @@ -2227,9 +2227,9 @@ void TerrainPatch::DestroyCollision() ScopeLock lock(_collisionLocker); ASSERT(HasCollision()); - void* scene = _terrain->GetPhysicsScene()->GetPhysicsScene(); + void* scene = _terrain->GetPhysicsScene() ? _terrain->GetPhysicsScene()->GetPhysicsScene() : nullptr; PhysicsBackend::RemoveCollider(_terrain); - if (_terrain->IsDuringPlay() && _terrain->IsActiveInHierarchy()) + if (scene && _terrain->IsDuringPlay() && _terrain->IsActiveInHierarchy()) PhysicsBackend::RemoveSceneActor(scene, _physicsActor); PhysicsBackend::DestroyActor(_physicsActor); PhysicsBackend::DestroyShape(_physicsShape);