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

Fix crash on shutdown when physical material asset was left alone

Browse Source
This commit is contained in:
Wojtek Figat
2024-06-26 18:19:36 +02:00
parent 18c3f274f8
commit 91d3216a00
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Engine/Physics/PhysX/PhysicsBackendPhysX.cpp
View File

@@ -4476,6 +4476,8 @@ void PhysicsBackend::DestroyController(void* controller)
void PhysicsBackend::DestroyMaterial(void* material) void PhysicsBackend::DestroyMaterial(void* material)
{ {
if (!PhysX)
return; // Skip when called by Content unload after Physics is disposed
ASSERT_LOW_LAYER(material); ASSERT_LOW_LAYER(material);
auto materialPhysX = (PxMaterial*)material; auto materialPhysX = (PxMaterial*)material;
materialPhysX->userData = nullptr; materialPhysX->userData = nullptr;
@@ -4486,6 +4488,8 @@ void PhysicsBackend::DestroyMaterial(void* material)
void PhysicsBackend::DestroyObject(void* object) void PhysicsBackend::DestroyObject(void* object)
{ {
if (!PhysX)
return; // Skip when called by Content unload after Physics is disposed
ASSERT_LOW_LAYER(object); ASSERT_LOW_LAYER(object);
auto objectPhysX = (PxBase*)object; auto objectPhysX = (PxBase*)object;
FlushLocker.Lock(); FlushLocker.Lock();