diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2010-05-30 01:31:57 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2010-05-30 01:31:57 +0400 |
| commit | c6bec43330be0874b4116d259bbaf9fb90ed0556 (patch) | |
| tree | a1de833c9b4067a0659461ce8af20857678034ed /source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp | |
| parent | 9d3157eed000e7c543d04f5ad3efc5990675903b (diff) | |
reverting previous commit from Mitchell. His commit went to the trunk instead of the branch :)
svn merge -r 29067:29066 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp index e793f9d5966..44ae032179b 100644 --- a/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp +++ b/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp @@ -184,14 +184,6 @@ void KX_ConvertBulletObject( class KX_GameObject* gameobj, bm = shapeInfo->CreateBulletShape(ci.m_margin); break; } - case KX_BOUNDCAPSULE: - { - shapeInfo->m_radius = objprop->m_boundobject.c.m_radius; - shapeInfo->m_height = objprop->m_boundobject.c.m_height; - shapeInfo->m_shapeType = PHY_SHAPE_CAPSULE; - bm = shapeInfo->CreateBulletShape(ci.m_margin); - break; - } case KX_BOUNDMESH: { // mesh shapes can be shared, check first if we already have a shape on that mesh |