Merge branch 'master' of github.com:syoyo/tinyobjloader

2018-03-26 20:10:55 +09:00
parent 7fcfafb39a 5eda671225
commit bce1bb8387
8 changed files with 230 additions and 128 deletions
--- a/experimental/tinyobj_loader_opt.h
+++ b/experimental/tinyobj_loader_opt.h
@@ -1523,7 +1523,6 @@ bool parseObj(attrib_t *attrib, std::vector<shape_t> *shapes,
        size_t t_count = t_offsets[t];
        size_t f_count = f_offsets[t];
        size_t face_count = face_offsets[t];
-        int material_id = -1;  // -1 = default unknown material.

        for (size_t i = 0; i < commands[t].size(); i++) {
          if (commands[t][i].type == COMMAND_EMPTY) {