Commit 1c85080a authored by Jan Möbius's avatar Jan Möbius

- Updated changelog

- Always emit warning
parent 6c6ce56c
Pipeline #1289 passed with stage
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
<b>IO</b> <b>IO</b>
<ul> <ul>
<li>Obj reader: added texCoord3d functions to objloader</li> <li>Obj reader: added texCoord3d functions to objloader</li>
<li>PLY Reader: Don't emit warning for every complex face but warn only once in the end.</li>
<li>Importer: Integrate non-manifold faces while importing and not at the end. Fixes missing properties on non-manifolds. (Thanks to Max Limper for the patch, Merge Request 51)<li> <li>Importer: Integrate non-manifold faces while importing and not at the end. Fixes missing properties on non-manifolds. (Thanks to Max Limper for the patch, Merge Request 51)<li>
</ul> </ul>
......
...@@ -456,11 +456,11 @@ bool _PLYReader_::read_ascii(std::istream& _in, BaseImporter& _bi, const Options ...@@ -456,11 +456,11 @@ bool _PLYReader_::read_ascii(std::istream& _in, BaseImporter& _bi, const Options
} }
if (err_enabled) { if (err_enabled)
omerr().enable(); omerr().enable();
if (complex_faces)
omerr() << complex_faces << " invalid faces could not be added.\n"; if (complex_faces)
} omerr() << complex_faces << "The reader encountered invalid faces, that could not be added.\n";
// File was successfully parsed. // File was successfully parsed.
return true; return true;
...@@ -646,11 +646,12 @@ bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap ...@@ -646,11 +646,12 @@ bool _PLYReader_::read_binary(std::istream& _in, BaseImporter& _bi, bool /*_swap
} }
} }
if (err_enabled) { if (err_enabled)
omerr().enable(); omerr().enable();
if (complex_faces)
omerr() << complex_faces << " invalid faces could not be added.\n"; if (complex_faces)
} omerr() << complex_faces << "The reader encountered invalid faces, that could not be added.\n";
return true; return true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment