Merge branch 'develop' into objloader-refactor

2020-12-28 12:43:43 +01:00
parent fcf03b27fa afa98e8bdf
commit 25255c1c22
58 changed files with 1776 additions and 1125 deletions
@@ -71,8 +71,7 @@ void ObjLoader::load(MeshFrame *o_result, char *t_filename, float t_scale, u8 t_
            }
            else if (strcmp(lineHeader, "f") == 0)
            {
-
-                int *x;
+                int *x = NULL;
                fpos_t start;
                fgetpos(file, &start);
                int matches = fscanf(file, "%d/%d/%d %d/%d/%d %d/%d/%d\n", x, x, x, x, x, x, x, x, x);