TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 07:48:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

assimp: Fix memory corruption in load_texture_stage()

Browse Source
This commit is contained in:
rdb 2022-11-02 19:31:54 +01:00
parent d8a537b59b
commit 09a81e0d68
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandatool/src/assimp/assimpLoader.cxx
View File

@ -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