From 2a871176d498ac30a71984ce0baab3953b9d0ef2 Mon Sep 17 00:00:00 2001
From: "erwin.coumans" <erwin.coumans@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Wed, 29 Oct 2008 07:01:56 +0000
Subject: [PATCH] fix broken OS X build

---
 .../BroadphaseCollision/btDbvt.h               |  6 +++---
 src/BulletSoftBody/btSoftBody.cpp              | 18 ++++++++++++++----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/BulletCollision/BroadphaseCollision/btDbvt.h b/src/BulletCollision/BroadphaseCollision/btDbvt.h
index 56c9a8fae..72a5b36fc 100644
--- a/src/BulletCollision/BroadphaseCollision/btDbvt.h
+++ b/src/BulletCollision/BroadphaseCollision/btDbvt.h
@@ -794,13 +794,13 @@ inline void		btDbvt::collideTT(	const btDbvtNode* root0,
 			m_stkStack.resize(DOUBLE_STACKSIZE);
 			m_stkStack[0]=sStkNN(root0,root1);
 			do	{
-				sStkNN	p=stack[--depth];
+				sStkNN	p=m_stkStack[--depth];
 				if(Intersect(p.a->volume,p.b->volume,xform))
 				{
 					if(depth>treshold)
 					{
-						m_stkStack.resize(stack.size()*2);
-						treshold=stack.size()-4;
+						m_stkStack.resize(m_stkStack.size()*2);
+						treshold=m_stkStack.size()-4;
 					}
 					if(p.a->isinternal())
 					{
diff --git a/src/BulletSoftBody/btSoftBody.cpp b/src/BulletSoftBody/btSoftBody.cpp
index 37b3c5202..90056587a 100644
--- a/src/BulletSoftBody/btSoftBody.cpp
+++ b/src/BulletSoftBody/btSoftBody.cpp
@@ -486,13 +486,17 @@ void			btSoftBody::setTotalDensity(btScalar density)
 void			btSoftBody::transform(const btTransform& trs)
 {
 	const btScalar	margin=getCollisionShape()->getMargin();
+	ATTRIBUTE_ALIGNED16(btDbvtVolume)	vol;
+	
 	for(int i=0,ni=m_nodes.size();i<ni;++i)
 	{
 		Node&	n=m_nodes[i];
 		n.m_x=trs*n.m_x;
 		n.m_q=trs*n.m_q;
 		n.m_n=trs.getBasis()*n.m_n;
-		m_ndbvt.update(n.m_leaf,btDbvtVolume::FromCR(n.m_x,margin));
+		vol = btDbvtVolume::FromCR(n.m_x,margin);
+		
+		m_ndbvt.update(n.m_leaf,vol);
 	}
 	updateNormals();
 	updateBounds();
@@ -521,12 +525,15 @@ void			btSoftBody::rotate(	const btQuaternion& rot)
 void			btSoftBody::scale(const btVector3& scl)
 {
 	const btScalar	margin=getCollisionShape()->getMargin();
+	ATTRIBUTE_ALIGNED16(btDbvtVolume)	vol;
+	
 	for(int i=0,ni=m_nodes.size();i<ni;++i)
 	{
 		Node&	n=m_nodes[i];
 		n.m_x*=scl;
 		n.m_q*=scl;
-		m_ndbvt.update(n.m_leaf,btDbvtVolume::FromCR(n.m_x,margin));
+		vol = btDbvtVolume::FromCR(n.m_x,margin);
+		m_ndbvt.update(n.m_leaf,vol);
 	}
 	updateNormals();
 	updateBounds();
@@ -1303,11 +1310,13 @@ void			btSoftBody::predictMotion(btScalar dt)
 	/* Bounds				*/ 
 	updateBounds();	
 	/* Nodes				*/ 
+	ATTRIBUTE_ALIGNED16(btDbvtVolume)	vol;
 	for(i=0,ni=m_nodes.size();i<ni;++i)
 	{
 		Node&	n=m_nodes[i];
+		vol = btDbvtVolume::FromCR(n.m_x,m_sst.radmrg);
 		m_ndbvt.update(	n.m_leaf,
-			btDbvtVolume::FromCR(n.m_x,m_sst.radmrg),
+			vol,
 			n.m_v*m_sst.velmrg,
 			m_sst.updmrg);
 	}
@@ -1320,8 +1329,9 @@ void			btSoftBody::predictMotion(btScalar dt)
 			const btVector3	v=(	f.m_n[0]->m_v+
 				f.m_n[1]->m_v+
 				f.m_n[2]->m_v)/3;
+			vol = VolumeOf(f,m_sst.radmrg);
 			m_fdbvt.update(	f.m_leaf,
-				VolumeOf(f,m_sst.radmrg),
+				vol,
 				v*m_sst.velmrg,
 				m_sst.updmrg);
 		}