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

Merge branch 'master' into reorg

pull/2506/head
Kim Kulling 2019-06-11 20:59:46 +02:00
parent a6e3fc3fd9 1651f16239
commit fc065d8ab4
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/glTF/glTFImporter.cpp
View File

@ -713,7 +713,11 @@ void glTFImporter::ImportEmbeddedTextures(glTF::Asset& r)
} }
} }
void glTFImporter::InternReadFile(const std::string& pFile, aiScene* pScene, IOSystem* pIOHandler) { void glTFImporter::InternReadFile(const std::string& pFile, aiScene* pScene, IOSystem* pIOHandler)
{
// clean all member arrays
meshOffsets.clear();
embeddedTexIdxs.clear();
this->mScene = pScene; this->mScene = pScene;

6
code/glTF2/glTF2Importer.cpp
View File

@ -1128,7 +1128,11 @@ void glTF2Importer::ImportEmbeddedTextures(glTF2::Asset& r)
} }
} }
void glTF2Importer::InternReadFile(const std::string& pFile, aiScene* pScene, IOSystem* pIOHandler) { void glTF2Importer::InternReadFile(const std::string& pFile, aiScene* pScene, IOSystem* pIOHandler)
{
// clean all member arrays
meshOffsets.clear();
embeddedTexIdxs.clear();
this->mScene = pScene; this->mScene = pScene;