GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix terrain physics error on end play when it's disabled

Browse Source 
#3590 #3603
This commit is contained in:
Wojtek Figat
2025-10-03 22:30:44 +02:00
parent c61c013517
commit 8f3b80492e
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/Terrain/Terrain.cpp
View File

@@ -852,9 +852,7 @@ void Terrain::OnEnable()
{ {
auto patch = _patches[i]; auto patch = _patches[i];
if (patch->_physicsActor) if (patch->_physicsActor)
{
PhysicsBackend::AddSceneActor(scene, patch->_physicsActor); PhysicsBackend::AddSceneActor(scene, patch->_physicsActor);
}
} }
// Base // Base
@@ -873,9 +871,7 @@ void Terrain::OnDisable()
{ {
auto patch = _patches[i]; auto patch = _patches[i];
if (patch->_physicsActor) if (patch->_physicsActor)
{
PhysicsBackend::RemoveSceneActor(scene, patch->_physicsActor); PhysicsBackend::RemoveSceneActor(scene, patch->_physicsActor);
}
} }
// Base // Base

3
Source/Engine/Terrain/TerrainPatch.cpp
View File

@@ -2218,7 +2218,8 @@ void TerrainPatch::DestroyCollision()
void* scene = _terrain->GetPhysicsScene()->GetPhysicsScene(); void* scene = _terrain->GetPhysicsScene()->GetPhysicsScene();
PhysicsBackend::RemoveCollider(_terrain); PhysicsBackend::RemoveCollider(_terrain);
PhysicsBackend::RemoveSceneActor(scene, _physicsActor); if (_terrain->IsDuringPlay() && _terrain->IsActiveInHierarchy())
PhysicsBackend::RemoveSceneActor(scene, _physicsActor);
PhysicsBackend::DestroyActor(_physicsActor); PhysicsBackend::DestroyActor(_physicsActor);
PhysicsBackend::DestroyShape(_physicsShape); PhysicsBackend::DestroyShape(_physicsShape);
PhysicsBackend::DestroyObject(_physicsHeightField); PhysicsBackend::DestroyObject(_physicsHeightField);