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

fixes related to tinyxml2

Browse Source
This commit is contained in:
erwincoumans
2018-04-12 12:46:43 -07:00
parent 9c5d757879
commit dbb0318782
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -876,11 +876,10 @@ bool btBulletXmlWorldImporter::loadFile(const char* fileName)
{ {
XMLDocument doc; XMLDocument doc;
bool loadOkay = doc.LoadFile(fileName);
//dump_to_stdout(&doc,0);
XMLError loadOkay = doc.LoadFile(fileName);
if (loadOkay)
if (loadOkay==XML_SUCCESS)
{ {
if (get_int_attribute_by_name(doc.FirstChildElement()->ToElement(),"version", &m_fileVersion)) if (get_int_attribute_by_name(doc.FirstChildElement()->ToElement(),"version", &m_fileVersion))
{ {

2
examples/Importers/ImportColladaDemo/LoadMeshFromCollada.cpp
View File

@@ -575,7 +575,7 @@ void LoadMeshFromCollada(const char* relativeFileName, btAlignedObjectArray<GLIn
} }
XMLDocument doc; XMLDocument doc;
if (!doc.LoadFile(filename)) if (doc.LoadFile(filename) != XML_SUCCESS)
return; return;
//We need units to be in meter, so apply a scaling using the asset/units meter //We need units to be in meter, so apply a scaling using the asset/units meter