Bläddra i källkod

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

pull/971/head
chriscamacho 5 år sedan
committed by Ray
förälder
incheckning
314c4061df
1 ändrade filer med 8 tillägg och 1 borttagningar
  1. +8
    -1
      src/models.c

+ 8
- 1
src/models.c Visa fil

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

Laddar…
Avbryt
Spara