Merge remote-tracking branch 'refs/remotes/syoyo/master'

# Conflicts:
#	tiny_obj_loader.h
This commit is contained in:
Vazquinhos
2016-05-13 14:03:03 +02:00
3 changed files with 5 additions and 4 deletions

View File

@@ -5,7 +5,7 @@
//
//
// version 0.9.21: Flat normal creation flag for .obj files that do not have normals
// version 0.9.22: Introduce `load_flags_t`.
// version 0.9.20: Fixes creating per-face material using `usemtl`(#68)
// version 0.9.17: Support n-polygon and crease tag(OpenSubdiv extension)
// version 0.9.16: Make tinyobjloader header-only