From aab5652e7de9fdd3976921fee2a538532d7f428b Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Sat, 27 Feb 2010 02:16:25 +0000 Subject: [PATCH] fix a serialization bug with btStridingMeshInterface with short indices (16 bit) --- Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp | 2 +- src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp b/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp index 32339e35e..95f25e85c 100644 --- a/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp +++ b/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp @@ -1112,7 +1112,7 @@ btRigidBody* btBulletWorldImporter::getRigidBodyByName(const char* name) btRigidBody** bodyPtr = m_nameBodyMap.find(name); if (bodyPtr && *bodyPtr) { - *bodyPtr; + return *bodyPtr; } return 0; } diff --git a/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp b/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp index ca2720772..e84eaf06f 100644 --- a/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp +++ b/src/BulletCollision/CollisionShapes/btStridingMeshInterface.cpp @@ -252,7 +252,7 @@ const char* btStridingMeshInterface::serialize(void* dataBuffer, btSerializer* s int numindices = numtriangles*3; if (numindices) { - btChunk* chunk = serializer->allocate(sizeof(btIntIndexData),numindices); + btChunk* chunk = serializer->allocate(sizeof(btShortIntIndexData),numindices); btShortIntIndexData* tmpIndices = (btShortIntIndexData*)chunk->m_oldPtr; memPtr->m_indices16 = tmpIndices; for (gfxindex=0;gfxindex