diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2008-09-17 06:30:19 +0400 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2008-09-17 06:30:19 +0400 |
| commit | 651c0e48610433fa0823a3d94d30ee608860eb49 (patch) | |
| tree | ea56bd624b35c780d14ee7a1885802cd721c25be /extern/bullet2/src/BulletCollision/CollisionDispatch | |
| parent | ae418491dcbfa5c7e7415523695bdaea78a0b03e (diff) | |
Applied some fixes from Bullet: issues with btDbvtBroadphase, and btSoftBody, and better fix for 64-bit issue in btCompoundCollisionAlgorithm.
Diffstat (limited to 'extern/bullet2/src/BulletCollision/CollisionDispatch')
| -rw-r--r-- | extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp index 57812818007..535b61992b0 100644 --- a/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp +++ b/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp @@ -141,7 +141,7 @@ public: } void Process(const btDbvtNode* leaf) { - int index = int(long(leaf->data)); + int index = leaf->dataAsInt; btCompoundShape* compoundShape = static_cast<btCompoundShape*>(m_compoundColObj->getCollisionShape()); btCollisionShape* childShape = compoundShape->getChildShape(index); |