diff options
| author | erwin.coumans <erwin.coumans@08e121b0-ae19-0410-a57b-3be3395fd4fd> | 2008-11-12 22:25:23 +0000 |
|---|---|---|
| committer | erwin.coumans <erwin.coumans@08e121b0-ae19-0410-a57b-3be3395fd4fd> | 2008-11-12 22:25:23 +0000 |
| commit | 9516e505a761381270aafcaf5078765064c31dac (patch) | |
| tree | 2a88c3a65698dc4542cdc7d3127569fe5d8e04cb /src/BulletCollision/BroadphaseCollision/btDbvt.h | |
| parent | 5feea39803a24d449d1a9182bb699f9b28df47b0 (diff) | |
| download | bullet3-9516e505a761381270aafcaf5078765064c31dac.tar.gz | |
fix broken build
Add btCompoundShape export support for BulletColladaConverter.
Thanks to JamesH for the report/request:
http://www.bulletphysics.com/Bullet/phpBB3/viewtopic.php?f=12&t=2840
Diffstat (limited to 'src/BulletCollision/BroadphaseCollision/btDbvt.h')
| -rw-r--r-- | src/BulletCollision/BroadphaseCollision/btDbvt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/BulletCollision/BroadphaseCollision/btDbvt.h b/src/BulletCollision/BroadphaseCollision/btDbvt.h index 5a0f1c2f7..e8a47e70e 100644 --- a/src/BulletCollision/BroadphaseCollision/btDbvt.h +++ b/src/BulletCollision/BroadphaseCollision/btDbvt.h @@ -579,7 +579,7 @@ DBVT_INLINE int Select( const btDbvtAabbMm& o, const btDbvtAabbMm& b)
{
#if DBVT_SELECT_IMPL == DBVT_IMPL_SSE
- static DBVT_ALIGN const unsigned __int32 mask[]={0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff};
+ static ATTRIBUTE_ALIGNED16(const unsigned __int32) mask[]={0x7fffffff,0x7fffffff,0x7fffffff,0x7fffffff};
///@todo: the intrinsic version is 11% slower
#if DBVT_USE_INTRINSIC_SSE
@@ -612,7 +612,7 @@ DBVT_INLINE int Select( const btDbvtAabbMm& o, return tmp.ints[0]&1;
#else
- DBVT_ALIGN __int32 r[1];
+ ATTRIBUTE_ALIGNED16(__int32 r[1]);
__asm
{
mov eax,o
|