diff options
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h index 6c844e8c0af..a3f9a472394 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btMinkowskiSumShape.h @@ -20,7 +20,7 @@ subject to the following restrictions: #include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types /// The btMinkowskiSumShape is only for advanced users. This shape represents implicit based minkowski sum of two convex implicit shapes. -class btMinkowskiSumShape : public btConvexInternalShape +ATTRIBUTE_ALIGNED16(class) btMinkowskiSumShape : public btConvexInternalShape { btTransform m_transA; @@ -30,6 +30,8 @@ class btMinkowskiSumShape : public btConvexInternalShape public: +BT_DECLARE_ALIGNED_ALLOCATOR(); + btMinkowskiSumShape(const btConvexShape* shapeA,const btConvexShape* shapeB); virtual btVector3 localGetSupportingVertexWithoutMargin(const btVector3& vec)const; |