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

fix a serialization bug with btStridingMeshInterface with short indices (16 bit)

Browse Source
This commit is contained in:
erwin.coumans
2010-02-27 02:16:25 +00:00
parent 4add96ce75
commit aab5652e7d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp
View File

@@ -1112,7 +1112,7 @@ btRigidBody* btBulletWorldImporter::getRigidBodyByName(const char* name)
btRigidBody** bodyPtr = m_nameBodyMap.find(name); btRigidBody** bodyPtr = m_nameBodyMap.find(name);
if (bodyPtr && *bodyPtr) if (bodyPtr && *bodyPtr)
{ {
*bodyPtr; return *bodyPtr;
} }
return 0; return 0;
} }

2
src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp
View File

@@ -252,7 +252,7 @@ const char* btStridingMeshInterface::serialize(void* dataBuffer, btSerializer* s
int numindices = numtriangles*3; int numindices = numtriangles*3;
if (numindices) if (numindices)
{ {
btChunk* chunk = serializer->allocate(sizeof(btIntIndexData),numindices); btChunk* chunk = serializer->allocate(sizeof(btShortIntIndexData),numindices);
btShortIntIndexData* tmpIndices = (btShortIntIndexData*)chunk->m_oldPtr; btShortIntIndexData* tmpIndices = (btShortIntIndexData*)chunk->m_oldPtr;
memPtr->m_indices16 = tmpIndices; memPtr->m_indices16 = tmpIndices;
for (gfxindex=0;gfxindex<numtriangles;gfxindex++) for (gfxindex=0;gfxindex<numtriangles;gfxindex++)