diff options
| author | Martin Poirier <theeth@yahoo.com> | 2009-03-13 21:04:38 +0300 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2009-03-13 21:04:38 +0300 |
| commit | 54a55827ecee7f25d6a52255d8a639498a678fa6 (patch) | |
| tree | 6311657bfab7e75fa59e6828e0381bdcd4ec9eda /extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h | |
| parent | dff781c2a8c77f35fefe00b0a561235861d4d053 (diff) | |
| parent | 39acb4efa4c3f35806f5dc37124ff1028eb18215 (diff) | |
merging trunk 19093:19274etch-a-ton
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h index d7d78407b61..8720d53ae63 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btEmptyShape.h @@ -51,14 +51,14 @@ public: virtual void calculateLocalInertia(btScalar mass,btVector3& inertia) const; - virtual int getShapeType() const { return EMPTY_SHAPE_PROXYTYPE;} - - virtual const char* getName()const { return "Empty"; } + virtual void processAllTriangles(btTriangleCallback* ,const btVector3& ,const btVector3& ) const + { + } protected: btVector3 m_localScaling; |