From c9e5f2df057303b900fda47e33a6310891eb672a Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Tue, 16 Sep 2008 06:17:33 +0000 Subject: [PATCH] fix 64-bit issue, can't cast void* to int. --- src/BulletCollision/BroadphaseCollision/btDbvt.h | 1 + .../CollisionDispatch/btCompoundCollisionAlgorithm.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/BulletCollision/BroadphaseCollision/btDbvt.h b/src/BulletCollision/BroadphaseCollision/btDbvt.h index 10162e585..9fe800e3c 100644 --- a/src/BulletCollision/BroadphaseCollision/btDbvt.h +++ b/src/BulletCollision/BroadphaseCollision/btDbvt.h @@ -188,6 +188,7 @@ struct btDbvtNode union { btDbvtNode* childs[2]; void* data; + int dataAsInt; }; }; diff --git a/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp b/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp index da9336c55..535b61992 100644 --- a/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp +++ b/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp @@ -141,7 +141,7 @@ public: } void Process(const btDbvtNode* leaf) { - int index = int(leaf->data); + int index = leaf->dataAsInt; btCompoundShape* compoundShape = static_cast(m_compoundColObj->getCollisionShape()); btCollisionShape* childShape = compoundShape->getChildShape(index);