Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove intptr_t, it breaks the build and it was not necessary

Browse Source
This commit is contained in:
erwin.coumans
2012-09-29 05:00:46 +00:00
parent cfb609f9d1
commit 6284ded4a1
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Extras/Serialize/BulletXmlWorldImporter/btBulletXmlWorldImporter.cpp
View File

@@ -586,8 +586,8 @@ void btBulletXmlWorldImporter::fixupCollisionDataPointers(btCollisionShapeData*
case COMPOUND_SHAPE_PROXYTYPE: case COMPOUND_SHAPE_PROXYTYPE:
{ {
btCompoundShapeData* compound = (btCompoundShapeData*) shapeData; btCompoundShapeData* compound = (btCompoundShapeData*) shapeData;
int ptr = (intptr_t) compound->m_childShapePtr;
void** cdptr = m_pointerLookup.find((void*)ptr); void** cdptr = m_pointerLookup.find((void*)compound->m_childShapePtr);
btCompoundShapeChildData** c = (btCompoundShapeChildData**)cdptr; btCompoundShapeChildData** c = (btCompoundShapeChildData**)cdptr;
btAssert(c); btAssert(c);
if (c) if (c)
@@ -603,8 +603,7 @@ void btBulletXmlWorldImporter::fixupCollisionDataPointers(btCollisionShapeData*
case CONVEX_HULL_SHAPE_PROXYTYPE: case CONVEX_HULL_SHAPE_PROXYTYPE:
{ {
btConvexHullShapeData* convexData = (btConvexHullShapeData*)shapeData; btConvexHullShapeData* convexData = (btConvexHullShapeData*)shapeData;
int ptr = (intptr_t)convexData->m_unscaledPointsFloatPtr; btVector3FloatData** ptrptr = (btVector3FloatData**)m_pointerLookup.find((void*)convexData->m_unscaledPointsFloatPtr);
btVector3FloatData** ptrptr = (btVector3FloatData**)m_pointerLookup.find((void*)ptr);
btAssert(ptrptr); btAssert(ptrptr);
if (ptrptr) if (ptrptr)
{ {