UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

7
src/models.c
View file

@ -669,8 +669,10 @@ 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();
if (model.meshMaterial==NULL) {
model.meshMaterial = (int *)RL_CALLOC(model.meshCount, sizeof(int)); 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