diff options
| author | Sergej Reich <sergej.reich@googlemail.com> | 2013-03-07 21:53:16 +0400 |
|---|---|---|
| committer | Sergej Reich <sergej.reich@googlemail.com> | 2013-03-07 21:53:16 +0400 |
| commit | 643b0be4cb3f73bd876493d2a7bd6f76ef27cf06 (patch) | |
| tree | 33fa8c08a902176f4204b6cc6a18702997bd90ba /extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h | |
| parent | 46d32c89f6df911120579d00dd6e1246536cb6d8 (diff) | |
bullet: Update to current svn, r2636
Apply patches in patches directory, remove patches that were applied
upstream.
If you made changes without adding a patch, please check.
Fixes [#32233] exporting bullet format results in corrupt files.
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h index 2a03241c9d7..2917cc5b60f 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btConcaveShape.h @@ -33,12 +33,14 @@ typedef enum PHY_ScalarType { ///The btConcaveShape class provides an interface for non-moving (static) concave shapes. ///It has been implemented by the btStaticPlaneShape, btBvhTriangleMeshShape and btHeightfieldTerrainShape. -class btConcaveShape : public btCollisionShape +ATTRIBUTE_ALIGNED16(class) btConcaveShape : public btCollisionShape { protected: btScalar m_collisionMargin; public: + BT_DECLARE_ALIGNED_ALLOCATOR(); + btConcaveShape(); virtual ~btConcaveShape(); |