diff options
-rw-r--r-- | source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp index 3c9c5d0a239..bbc3968347c 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp @@ -1901,8 +1901,10 @@ btDispatcher* CcdPhysicsEnvironment::GetDispatcher() void CcdPhysicsEnvironment::MergeEnvironment(PHY_IPhysicsEnvironment *other_env) { CcdPhysicsEnvironment *other = dynamic_cast<CcdPhysicsEnvironment*>(other_env); - printf("KX_Scene::MergeScene: Other scene is not using Bullet physics, not merging physics.\n"); - return; + if (other == NULL) { + printf("KX_Scene::MergeScene: Other scene is not using Bullet physics, not merging physics.\n"); + return; + } std::set<CcdPhysicsController*>::iterator it; |