aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/models.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/models.c b/src/models.c
index 7c69553c..0d4c3619 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