v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/assimp/assimp

pull/297/head
Gregory Jaegy 2014-06-13 10:59:16 +02:00
parent 16ae05eeeb bd0c2835f8
commit 5efc0207f3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/OgreImporter.cpp
View File

@ -108,10 +108,10 @@ void OgreImporter::InternReadFile(const std::string &pFile, aiScene *pScene, Ass
MemoryStreamReader reader(f); MemoryStreamReader reader(f);
// Import mesh // Import mesh
boost::scoped_ptr<Mesh> mesh = OgreBinarySerializer::ImportMesh(&reader); boost::scoped_ptr<Mesh> mesh(OgreBinarySerializer::ImportMesh(&reader));
// Import skeleton // Import skeleton
OgreBinarySerializer::ImportSkeleton(pIOHandler, mesh); OgreBinarySerializer::ImportSkeleton(pIOHandler, mesh.get());
// Import mesh referenced materials // Import mesh referenced materials
ReadMaterials(pFile, pIOHandler, pScene, mesh.get()); ReadMaterials(pFile, pIOHandler, pScene, mesh.get());
@ -128,10 +128,10 @@ void OgreImporter::InternReadFile(const std::string &pFile, aiScene *pScene, Ass
boost::scoped_ptr<XmlReader> reader(irr::io::createIrrXMLReader(xmlStream.get())); boost::scoped_ptr<XmlReader> reader(irr::io::createIrrXMLReader(xmlStream.get()));
// Import mesh // Import mesh
boost::scoped_ptr<MeshXml> mesh = OgreXmlSerializer::ImportMesh(reader.get()); boost::scoped_ptr<MeshXml> mesh(OgreXmlSerializer::ImportMesh(reader.get()));
// Import skeleton // Import skeleton
OgreXmlSerializer::ImportSkeleton(pIOHandler, mesh); OgreXmlSerializer::ImportSkeleton(pIOHandler, mesh.get());
// Import mesh referenced materials // Import mesh referenced materials
ReadMaterials(pFile, pIOHandler, pScene, mesh.get()); ReadMaterials(pFile, pIOHandler, pScene, mesh.get());

2
code/OgreStructs.cpp
View File

@ -325,7 +325,7 @@ uint32_t VertexData::VertexSize(uint16_t source) const
MemoryStream *VertexData::VertexBuffer(uint16_t source) MemoryStream *VertexData::VertexBuffer(uint16_t source)
{ {
if (vertexBindings.find(source) != vertexBindings.end()) if (vertexBindings.find(source) != vertexBindings.end())
return vertexBindings[source]; return vertexBindings[source].get();
return 0; return 0;
} }