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

syoyo · syoyo · commit 007b110147cf · 2019-05-06T20:32:19.000+09:00
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "pybind11/tools/clang"]
+	path = pybind11/tools/clang
+	url = ../../wjakob/clang-cindex-python3
diff --git a/README.md b/README.md
@@ -201,7 +201,7 @@ mesh_t::num_face_vertices => array of the number of vertices per face(e.g. 3 = t
 
 ```
 
-Note that when `triangulate` flas is true in `tinyobj::LoadObj()` argument, `num_face_vertices` are all filled with 3(triangle).
+Note that when `triangulate` flag is true in `tinyobj::LoadObj()` argument, `num_face_vertices` are all filled with 3(triangle).
 
 ### float data type
 
@@ -225,7 +225,11 @@ std::string err;
 
 bool ret = tinyobj::LoadObj(&attrib, &shapes, &materials, &warn, &err, inputfile.c_str());
 
-if (!err.empty()) { // `err` may contain warning message.
+if (!warn.empty()) {
+  std::cout << warn << std::endl;
+}
+
+if (!err.empty()) {
   std::cerr << err << std::endl;
 }
 
diff --git a/pybind11/.gitmodules b/pybind11/.gitmodules

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "pybind11/tools/clang"]`
	`2`	`+ path = pybind11/tools/clang`
	`3`	`+ url = ../../wjakob/clang-cindex-python3`