Browse Source

assimp: Fix memory corruption in load_texture_stage()

rdb 3 years ago
parent
commit
09a81e0d68
1 changed files with 2 additions and 2 deletions
  1. 2 2
      pandatool/src/assimp/assimpLoader.cxx

+ 2 - 2
pandatool/src/assimp/assimpLoader.cxx

@@ -291,10 +291,10 @@ load_texture_stage(const aiMaterial &mat, const aiTextureType &ttype, CPT(Textur
   unsigned int uvindex;
   unsigned int uvindex;
   float blend;
   float blend;
   aiTextureOp op;
   aiTextureOp op;
-  aiTextureMapMode mapmode;
+  aiTextureMapMode mapmode[3];
 
 
   for (size_t i = 0; i < mat.GetTextureCount(ttype); ++i) {
   for (size_t i = 0; i < mat.GetTextureCount(ttype); ++i) {
-    mat.GetTexture(ttype, i, &path, &mapping, nullptr, &blend, &op, &mapmode);
+    mat.GetTexture(ttype, i, &path, &mapping, nullptr, &blend, &op, mapmode);
 
 
     if (AI_SUCCESS != mat.Get(AI_MATKEY_UVWSRC(ttype, i), uvindex)) {
     if (AI_SUCCESS != mat.Get(AI_MATKEY_UVWSRC(ttype, i), uvindex)) {
       // If there's no texture coordinate set for this texture, assume that
       // If there's no texture coordinate set for this texture, assume that