From 314c4061df021425bce7cd173ebfa9d371f414cb Mon Sep 17 00:00:00 2001 From: chriscamacho Date: Thu, 19 Sep 2019 12:28:01 +0100 Subject: [PATCH] fixs issue mem leak with LoadModel / OBJ and issue with -1 material index (#969) --- src/models.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/models.c b/src/models.c index 7c69553c3..0d4c3619a 100644 --- a/src/models.c +++ b/src/models.c @@ -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