Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a bug in the STLReader where normals could be set for invalid face handles

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@963 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Isaak Lim
2013-09-26 13:02:09 +00:00
parent b643b26f2d
commit 733cb52240
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenMesh/Core/IO/reader/STLReader.cc
View File

@@ -323,7 +323,7 @@ read_stla(std::istream& _in, BaseImporter& _bi, Options& _opt) const
// set the normal if requested // set the normal if requested
// if a normal was requested but could not be found we unset the option // if a normal was requested but could not be found we unset the option
if (facet_normal) { if (facet_normal) {
if (_opt.face_has_normal()) if (fh.is_valid() && _opt.face_has_normal())
_bi.set_normal(fh, n); _bi.set_normal(fh, n);
} else } else
_opt -= Options::FaceNormal; _opt -= Options::FaceNormal;
@@ -432,7 +432,7 @@ read_stlb(std::istream& _in, BaseImporter& _bi, Options& _opt) const
(vhandles[1] != vhandles[2])) { (vhandles[1] != vhandles[2])) {
FaceHandle fh = _bi.add_face(vhandles); FaceHandle fh = _bi.add_face(vhandles);
if (_opt.face_has_normal()) if (fh.is_valid() && _opt.face_has_normal())
_bi.set_normal(fh, n); _bi.set_normal(fh, n);
} }