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.

3 files changed, 4 insertions, 6 deletions

diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp b/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
index dfb48e2ff2d..2553009fec2 100644
--- a/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
@@ -2002,7 +2002,7 @@ for(i=0;i<m_clusters.size();++i)
 				mi.setMin(c.m_nodes[j]->m_x);
 				mx.setMax(c.m_nodes[j]->m_x);
 				}			
-			const btDbvtVolume	bounds=btDbvtVolume::FromMM(mi,mx);
+			const ATTRIBUTE_ALIGNED16(btDbvtVolume)	bounds=btDbvtVolume::FromMM(mi,mx);
 			if(c.m_leaf)
 				m_cdbvt.update(c.m_leaf,bounds,c.m_lv*m_sst.sdt*3,m_sst.radmrg);
 				else
@@ -2532,7 +2532,7 @@ switch(m_cfg.collisions&fCollision::RVSmask)
 		const btScalar		basemargin=getCollisionShape()->getMargin();
 		btVector3			mins;
 		btVector3			maxs;
-		btDbvtVolume		volume;
+		ATTRIBUTE_ALIGNED16(btDbvtVolume)		volume;
 		pco->getCollisionShape()->getAabb(	pco->getInterpolationWorldTransform(),
 											mins,
 											maxs);
diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
index e9ec81f4d2c..d9919967233 100644
--- a/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
+++ b/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
@@ -373,7 +373,6 @@ void			btSoftBodyHelpers::DrawInfos(		btSoftBody* psb,
 						  bool areas,
 						  bool /*stress*/)
 {
-	/*
 	for(int i=0;i<psb->m_nodes.size();++i)
 	{
 		const btSoftBody::Node&	n=psb->m_nodes[i];
@@ -391,8 +390,6 @@ void			btSoftBodyHelpers::DrawInfos(		btSoftBody* psb,
 		}
 		if(text[0]) idraw->draw3dText(n.m_x,text);
 	}
-	*/
-
 }
 
 //
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);