diff --git a/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp b/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp index 0692879e5..320c0e0d0 100644 --- a/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp +++ b/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.cpp @@ -456,11 +456,8 @@ char* btBulletWorldImporter::duplicateName(const char* name) return 0; } - bool btBulletWorldImporter::loadFileFromMemory( bParse::btBulletFile* bulletFile2) { - - int i; bool ok = (bulletFile2->getFlags()& bParse::FD_OK)!=0; if (ok) @@ -473,6 +470,14 @@ bool btBulletWorldImporter::loadFileFromMemory( bParse::btBulletFile* bulletFil bulletFile2->dumpChunks(bulletFile2->getFileDNA()); } + convertAllObjects(bulletFile2); + +} + +bool btBulletWorldImporter::convertAllObjects( bParse::btBulletFile* bulletFile2) +{ + int i; + for (i=0;im_bvhs.size();i++) { btOptimizedBvh* bvh = createOptimizedBvh(); diff --git a/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.h b/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.h index 6c0dbc1ef..0d0579fcf 100644 --- a/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.h +++ b/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.h @@ -105,6 +105,9 @@ public: bool loadFileFromMemory(bParse::btBulletFile* file); + //call make sure bulletFile2 has been parsed, either using btBulletFile::parse or btBulletWorldImporter::loadFileFromMemory + bool convertAllObjects(bParse::btBulletFile* file); + void setVerboseMode(bool verboseDumpAllTypes) { m_verboseDumpAllTypes = verboseDumpAllTypes;