diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-07-26 03:16:45 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-07-26 03:16:45 +0400 |
| commit | 777a0d78e79d25c385eac4dd4835f8ca65317b26 (patch) | |
| tree | a3b5213e6ac6572ca966448044affec198b3e0e5 /source/gameengine/Ketsji/KX_ConvertPhysicsObject.h | |
| parent | 756488fbe2c0beaf205cb28d6f4ca1e62a64588a (diff) | |
| parent | e9ca43521f99c6b9baf6d9278f85323086fcade2 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r21899:21908
Diffstat (limited to 'source/gameengine/Ketsji/KX_ConvertPhysicsObject.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_ConvertPhysicsObject.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h index 9d3b9cdaf74..147bd238009 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h @@ -164,7 +164,7 @@ void KX_ConvertBulletObject( class KX_GameObject* gameobj, struct KX_ObjectProperties* objprop); void KX_ClearBulletSharedShapes(); -//bool KX_ReInstanceShapeFromMesh(RAS_MeshObject* meshobj); +bool KX_ReInstanceBulletShapeFromMesh(KX_GameObject *gameobj, KX_GameObject *from_gameobj, RAS_MeshObject* from_meshobj); #endif #endif //KX_CONVERTPHYSICSOBJECTS |