Upgrade to latest Bullet trunk, that is in sync with Blender/extern/bullet2. (except...

[blender.git] / extern / bullet2 / src / BulletSoftBody / btSoftBody.cpp

diff --git a/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp b/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
index dfb48e2ff2d85e6e34cc32355e344b3a092d9ee0..2553009fec2182b7a6a9d129a6b4e825cc7dada5 100644 (file)
--- 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);