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

Merge pull request #1860 from wanadev/gltf2-duplicated-textures 

[glTF2] Not duplicating embedded textures
pull/1872/head
Kim Kulling 2018-04-02 10:24:34 +02:00 committed by GitHub
parent 61fe3e52ce c24c1a7802
commit 00e2e60b67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/glTF2Exporter.cpp
View File

@ -316,11 +316,9 @@ void glTF2Exporter::GetMatTex(const aiMaterial* mat, Ref<Texture>& texture, aiTe
std::string path = tex.C_Str(); std::string path = tex.C_Str();
if (path.size() > 0) { if (path.size() > 0) {
if (path[0] != '*') { std::map<std::string, unsigned int>::iterator it = mTexturesByPath.find(path);
std::map<std::string, unsigned int>::iterator it = mTexturesByPath.find(path); if (it != mTexturesByPath.end()) {
if (it != mTexturesByPath.end()) { texture = mAsset->textures.Get(it->second);
texture = mAsset->textures.Get(it->second);
}
} }
if (!texture) { if (!texture) {