Merge branch 'master' of https://github.com/caryanne/tinyobjloader

2013-11-15 21:31:11 +09:00
parent 0d943a8a9d b17d15f5a0
commit d52efe044f
1 changed files with 1 additions and 0 deletions
--- a/tiny_obj_loader.cc
+++ b/tiny_obj_loader.cc
@@ -270,6 +270,7 @@ void InitMaterial(material_t& material) {
    material.emission[i] = 0.f;
  }
  material.shininess = 1.f;
+  material.unknown_parameter.clear();
 }

 std::string LoadMtl (