Merge branch 'master' of https://www.graphics.rwth-aachen.de:9000/OpenMesh/OpenMesh into featureMeshConversion

2016-12-14 15:13:27 +01:00
parent db47b38b02 5e9f74d7c7
commit 2d4abf2d8b
2 changed files with 3 additions and 3 deletions
--- a/Doc/images/OpenMesh_text_128.png
+++ b/Doc/images/OpenMesh_text_128.png
--- a/src/OpenMesh/Core/IO/writer/OBJWriter.cc
+++ b/src/OpenMesh/Core/IO/writer/OBJWriter.cc
@@ -273,11 +273,11 @@ write(std::ostream& _out, BaseExporter& _be, Options _opt, std::streamsize _prec
  //collect Texturevertices from vertices
  if(_opt.check(Options::VertexTexCoord))
  {
-    for (int i=0, nF=_be.n_faces(); i<nF; ++i)
+    for (size_t i=0, nF=_be.n_faces(); i<nF; ++i)
    {
-      vh = VertexHandle(int(i));
+      vh = VertexHandle(static_cast<int>(i));
      t  = _be.texcoord(vh);
-      texMap[t] = i;
+      texMap[t] = static_cast<int>(i);
    }
  }