From b64d5809e7e3b832e2a011869db68e70b4b4e6fc Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 17 Jan 2016 21:35:32 +0100 Subject: Upgrade Bullet to version 2.83. I tried to carefully preserve all patches since the last upgrade. Improves T47195, cloth collision detection bug. Differential Revision: https://developer.blender.org/D1739 --- .../src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h') diff --git a/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h b/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h index 493d635539e..1fa4995d160 100644 --- a/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h +++ b/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h @@ -39,7 +39,11 @@ ATTRIBUTE_ALIGNED16(class) btBvhTriangleMeshShape : public btTriangleMeshShape bool m_useQuantizedAabbCompression; bool m_ownsBvh; +#ifdef __clang__ + bool m_pad[11] __attribute__((unused));////need padding due to alignment +#else bool m_pad[11];////need padding due to alignment +#endif public: -- cgit v1.2.3