Merge branch 'master' into fix-paint3d-vertexcolor

pull/1735/head
Kim Kulling 2018-01-24 20:05:30 +01:00 committed by GitHub
commit 3a7b8d4aa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -387,7 +387,7 @@ struct aiScene
}
//! Returns an embedded texture
const aiTexture* GetEmbeddedTexture(const char* filename) {
const aiTexture* GetEmbeddedTexture(const char* filename) const {
const char* shortFilename = GetShortFilename(filename);
for (unsigned int i = 0; i < mNumTextures; i++) {
const char* shortTextureFilename = GetShortFilename(mTextures[i]->mFilename.C_Str());