diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2014-04-24 00:59:04 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2014-04-24 00:59:04 +0400 |
| commit | 81e28b8802a65a3efd6410e75a3fb92a21ed69a3 (patch) | |
| tree | 4a8d2200d2b894852520376087f939678d103ca7 /source | |
| parent | 3182c54da6fd2eb1b3b54781bb447a7bd51b553e (diff) | |
BGE Cleanup: Removing the empty KX_ClearBulletSharedShapes() function
Diffstat (limited to 'source')
| -rw-r--r-- | source/gameengine/Converter/KX_BlenderSceneConverter.cpp | 3 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_ConvertPhysicsObject.h | 3 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp | 5 |
3 files changed, 1 insertions, 10 deletions
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp index 854e9fe7327..6b7a53c9bf7 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp @@ -190,9 +190,6 @@ KX_BlenderSceneConverter::~KX_BlenderSceneConverter() } m_meshobjects.clear(); -#ifdef WITH_BULLET - KX_ClearBulletSharedShapes(); -#endif /* free any data that was dynamically loaded */ while (m_DynamicMaggie.size() != 0) diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h index 5e2556bd59b..4f341d793bb 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h @@ -47,8 +47,7 @@ void KX_ConvertBulletObject(class KX_GameObject* gameobj, int activeLayerBitInfo, bool isCompoundChild, bool hasCompoundChildren); - -void KX_ClearBulletSharedShapes(); + bool KX_ReInstanceBulletShapeFromMesh(KX_GameObject *gameobj, KX_GameObject *from_gameobj, RAS_MeshObject* from_meshobj); #endif diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp index f1a52e1790a..5791c9f3a7a 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp @@ -567,11 +567,6 @@ void KX_ConvertBulletObject( class KX_GameObject* gameobj, } - -void KX_ClearBulletSharedShapes() -{ -} - /* Refresh the physics object from either an object or a mesh. * gameobj must be valid * from_gameobj and from_meshobj can be NULL |