From a855a81d04393f0c3c42331b54039fecbe1e7f89 Mon Sep 17 00:00:00 2001
From: Daniel Chappuis <chappuis.daniel@gmail.com>
Date: Sun, 14 Jun 2020 23:18:13 +0200
Subject: [PATCH] Fix issue with assert in PhysicsWorld destructor

---
 src/engine/PhysicsWorld.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/engine/PhysicsWorld.cpp b/src/engine/PhysicsWorld.cpp
index b68528e4..b188f635 100644
--- a/src/engine/PhysicsWorld.cpp
+++ b/src/engine/PhysicsWorld.cpp
@@ -130,10 +130,6 @@ PhysicsWorld::~PhysicsWorld() {
 
 #endif
 
-    assert(mCollisionBodies.size() == 0);
-    assert(mCollisionBodyComponents.getNbComponents() == 0);
-    assert(mTransformComponents.getNbComponents() == 0);
-    assert(mCollidersComponents.getNbComponents() == 0);
     // Destroy all the joints that have not been removed
     for (uint32 i=0; i < mJointsComponents.getNbComponents(); i++) {
         destroyJoint(mJointsComponents.mJoints[i]);
@@ -146,6 +142,10 @@ PhysicsWorld::~PhysicsWorld() {
 
     assert(mJointsComponents.getNbComponents() == 0);
     assert(mRigidBodies.size() == 0);
+    assert(mCollisionBodies.size() == 0);
+    assert(mCollisionBodyComponents.getNbComponents() == 0);
+    assert(mTransformComponents.getNbComponents() == 0);
+    assert(mCollidersComponents.getNbComponents() == 0);
 
     RP3D_LOG(mConfig.worldName, Logger::Level::Information, Logger::Category::World,
              "Physics World: Physics world " + mName + " has been destroyed",  __FILE__, __LINE__);