Prechádzať zdrojové kódy

Merge branch 'master' into fix-paint3d-vertexcolor

Kim Kulling 7 rokov pred
rodič
commit
3a7b8d4aa5
1 zmenil súbory, kde vykonal 1 pridanie a 1 odobranie
  1. 1 1
      include/assimp/scene.h

+ 1 - 1
include/assimp/scene.h

@@ -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());