From 7f293488d12b5d5076b4bbf3d6c9248867c447a0 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Sat, 13 Sep 2008 07:06:43 +0000 Subject: Upgrade to latest Bullet trunk, that is in sync with Blender/extern/bullet2. (except for one define 'WIN32_AVOID_SSE_WHEN_EMBEDDED_INSIDE_BLENDER') In case someone reads those SVN logs: you can enable some extra broadphase SSE optimizations by replacing WIN32_AVOID_SSE_WHEN_EMBEDDED_INSIDE_BLENDER by WIN32 in extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h Thanks to Benoit Bolsee for the upstream patch/contribution. Removed some obsolete files, they were just intended for comparison/testing. --- extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h') diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h b/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h index 0c87770d714..1a7be2cb840 100644 --- a/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h +++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h @@ -750,7 +750,8 @@ struct btSoftColliders friction = btMin(psb->m_cfg.kDF,prb->getFriction()); btVector3 mins; btVector3 maxs; - btDbvtVolume volume; + + ATTRIBUTE_ALIGNED16(btDbvtVolume) volume; pr->getCollisionShape()->getAabb(pr->getInterpolationWorldTransform(),mins,maxs); volume=btDbvtVolume::FromMM(mins,maxs); volume.Expand(btVector3(1,1,1)*margin); -- cgit v1.2.3