diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2014-04-24 06:37:54 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2014-04-24 06:39:57 +0400 |
| commit | f5c3c624f8e62f266994be42fa4c85ce579321c0 (patch) | |
| tree | 1ecddb7f709c95840ffc5711f912e23d867306a3 /source/gameengine/Ketsji/KX_Scene.cpp | |
| parent | 4e5e3a978e497dad315fec2e3690c977a06ca779 (diff) | |
BGE Cleanup: Moving reinstancing physics shapes from KX_ConvertPhysicsObject to PHY_IPhysicsController
This was the last item in KX_ConvertPhysicsObject. Therefore,
KX_ConvertPhysicsObject.h and KX_ConvertPhysicsObjects.cpp have been
removed.
Diffstat (limited to 'source/gameengine/Ketsji/KX_Scene.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 50885515976..4ed5d83a2b7 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -95,7 +95,6 @@ #ifdef WITH_BULLET #include "KX_SoftBodyDeformer.h" -#include "KX_ConvertPhysicsObject.h" #endif #include "KX_Light.h" @@ -1276,11 +1275,10 @@ void KX_Scene::ReplaceMesh(class CValue* obj,void* meshobj, bool use_gfx, bool u gameobj->AddMeshUser(); } -#ifdef WITH_BULLET if (use_phys) { /* update the new assigned mesh with the physics mesh */ - KX_ReInstanceBulletShapeFromMesh(gameobj, NULL, use_gfx?NULL:mesh); + if (gameobj->GetPhysicsController()) + gameobj->GetPhysicsController()->ReinstancePhysicsShape(NULL, use_gfx?NULL:mesh); } -#endif } /* Font Object routines */ |