mirrors/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-10-10 11:56:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixs issue mem leak with LoadModel / OBJ and issue with -1 material index (#969)

Browse Source
This commit is contained in:
chriscamacho
2019-09-19 12:28:01 +01:00
committed by Ray
parent 08165fed18
commit 314c4061df
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/models.c
View File

@@ -669,7 +669,9 @@ Model LoadModel(const char *fileName)
model.materials = (Material *)RL_CALLOC(model.materialCount, sizeof(Material)); model.materials = (Material *)RL_CALLOC(model.materialCount, sizeof(Material));
model.materials[0] = LoadMaterialDefault(); model.materials[0] = LoadMaterialDefault();
model.meshMaterial = (int *)RL_CALLOC(model.meshCount, sizeof(int)); if (model.meshMaterial==NULL) {
model.meshMaterial = (int *)RL_CALLOC(model.meshCount, sizeof(int));
}
} }
return model; return model;
@@ -2860,6 +2862,11 @@ static Model LoadOBJ(const char *fileName)
// Assign mesh material for current mesh // Assign mesh material for current mesh
model.meshMaterial[m] = attrib.material_ids[m]; model.meshMaterial[m] = attrib.material_ids[m];
// set unfound materials to default
if (model.meshMaterial[m] == -1) {
model.meshMaterial[m] = 0;
}
} }
// Init model materials // Init model materials