Browse Source

Collada: next methods migrated.

kimkulling 5 years ago
parent
commit
d393f677ce
2 changed files with 40 additions and 782 deletions
  1. 39 781
      code/AssetLib/Collada/ColladaParser.cpp
  2. 1 1
      code/AssetLib/Ogre/OgreImporter.cpp

File diff suppressed because it is too large
+ 39 - 781
code/AssetLib/Collada/ColladaParser.cpp


+ 1 - 1
code/AssetLib/Ogre/OgreImporter.cpp

@@ -132,7 +132,7 @@ void OgreImporter::InternReadFile(const std::string &pFile, aiScene *pScene, Ass
         //std::unique_ptr<XmlReader> reader(irr::io::createIrrXMLReader(xmlStream.get()));
         xmlParser.parse(scopedFile.get());
         // Import mesh
-        std::unique_ptr<MeshXml> mesh(OgreXmlSerializer::ImportMesh(xmlParser));
+        std::unique_ptr<MeshXml> mesh(OgreXmlSerializer::ImportMesh(&xmlParser));
 
         // Import skeleton
         OgreXmlSerializer::ImportSkeleton(pIOHandler, mesh.get());

Some files were not shown because too many files changed in this diff