Merge branch 'master' into featureMeshConversion

Doc/changelog.docu

@@ -8,6 +8,30 @@
 
 <tr valign=top><td><b>7.0</b> (?/?/?)</td><td>
 
+<b>Core</b>
+<ul>
+<li>make all negative handles invalid, not just -1</li>
+<li>Several warnings fixed (Including the checked iterators)</li>
+</ul>
+
+<b>IO</b>
+<ul>
+<li>BaseExporter: Added accessor functions for HalfEdgeHandles and faceTexCoords to base exporter and exporter template.</li>
+<li>OBJ Writer: Added functionality to store FaceTexCoords to objwriter</li>
+<li>OBJ Loader: range check for vertex colors and normals in OBJ loader</li>
+<li>OBJ Loader: fixed handling of negative indices in OBJ loader</li>
+<li>OM Writer: Fixed OMWriter when no faces are available (Thanks to Jamie Kydd for the patch)</li>
+</ul>
+
+<b>Unittests</b>
+<ul>
+<li>Added unittest to write and read faceTexcoords with a test obj file</li>
+</ul>
+
+<b>General</b>
+<ul>
+<li>Updated Logo</li>
+</ul>
 
 </tr>
 

src/OpenMesh/Core/IO/writer/OMWriter.cc

@@ -318,7 +318,7 @@ bool _OMWriter_::write_binary(std::ostream& _os, BaseExporter& _be,
 
   // ---------- write face normals
 
-  if ( _be.has_face_normals() && _opt.check(Options::FaceNormal) )
+  if (_be.n_faces() && _be.has_face_normals() && _opt.check(Options::FaceNormal) )
   {
 #define NEW_STYLE 0
 #if NEW_STYLE
@@ -353,7 +353,7 @@ bool _OMWriter_::write_binary(std::ostream& _os, BaseExporter& _be,
 
   // ---------- write face color
 
-  if (_be.has_face_colors() && _opt.check( Options::FaceColor ))
+  if (_be.n_faces() && _be.has_face_colors() && _opt.check( Options::FaceColor ))
   {
 #define NEW_STYLE 0
 #if NEW_STYLE