Merge branch 'master' into fs_fix_simplify

This commit is contained in:
Filip Sykala 2021-09-30 09:40:22 +02:00
commit f7a479a90e
2 changed files with 2 additions and 2 deletions

View File

@ -1917,7 +1917,7 @@ namespace Slic3r {
int max_id = faces.front()[0];
for (const Vec3i& face : faces) {
for (const int tri_id : face) {
if (tri_id < 0 || tri_id >= geometry.vertices.size()) {
if (tri_id < 0 || tri_id >= int(geometry.vertices.size())) {
add_error("Found invalid vertex id");
return false;
}

View File

@ -73,7 +73,7 @@ bool load_obj(const char *path, TriangleMesh *meshptr)
break;
} else {
assert(cnt < 4);
if (vertex.coordIdx < 0 || vertex.coordIdx >= its.vertices.size()) {
if (vertex.coordIdx < 0 || vertex.coordIdx >= int(its.vertices.size())) {
BOOST_LOG_TRIVIAL(error) << "load_obj: failed to parse " << path << ". The file contains invalid vertex index.";
return false;
}