3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix its_number_of_patches returning bool instead of size_t

Browse source
This commit is contained in:
tamasmeszaros 2021-11-11 10:02:58 +01:00
parent 64e926b363
commit 549c98ac88
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libslic3r/TriangleMesh.cpp
View file

@ -1190,11 +1190,11 @@ std::vector<indexed_triangle_set> its_split(const indexed_triangle_set &its)
} }
// Number of disconnected patches (faces are connected if they share an edge, shared edge defined with 2 shared vertex indices). // Number of disconnected patches (faces are connected if they share an edge, shared edge defined with 2 shared vertex indices).
bool its_number_of_patches(const indexed_triangle_set &its) size_t its_number_of_patches(const indexed_triangle_set &its)
{ {
return its_number_of_patches<>(its); return its_number_of_patches<>(its);
} }
bool its_number_of_patches(const indexed_triangle_set &its, const std::vector<Vec3i> &face_neighbors) size_t its_number_of_patches(const indexed_triangle_set &its, const std::vector<Vec3i> &face_neighbors)
{ {
return its_number_of_patches<>(ItsNeighborsWrapper{ its, face_neighbors }); return its_number_of_patches<>(ItsNeighborsWrapper{ its, face_neighbors });
} }

4
src/libslic3r/TriangleMesh.hpp
View file

@ -219,8 +219,8 @@ std::vector<indexed_triangle_set> its_split(const indexed_triangle_set &its);
std::vector<indexed_triangle_set> its_split(const indexed_triangle_set &its, std::vector<Vec3i> &face_neighbors); std::vector<indexed_triangle_set> its_split(const indexed_triangle_set &its, std::vector<Vec3i> &face_neighbors);
// Number of disconnected patches (faces are connected if they share an edge, shared edge defined with 2 shared vertex indices). // Number of disconnected patches (faces are connected if they share an edge, shared edge defined with 2 shared vertex indices).
bool its_number_of_patches(const indexed_triangle_set &its); size_t its_number_of_patches(const indexed_triangle_set &its);
bool its_number_of_patches(const indexed_triangle_set &its, const std::vector<Vec3i> &face_neighbors); size_t its_number_of_patches(const indexed_triangle_set &its, const std::vector<Vec3i> &face_neighbors);
// Same as its_number_of_patches(its) > 1, but faster. // Same as its_number_of_patches(its) > 1, but faster.
bool its_is_splittable(const indexed_triangle_set &its); bool its_is_splittable(const indexed_triangle_set &its);
bool its_is_splittable(const indexed_triangle_set &its, const std::vector<Vec3i> &face_neighbors); bool its_is_splittable(const indexed_triangle_set &its, const std::vector<Vec3i> &face_neighbors);