Merge pull request #4560 from janetournois/PMP-fix_isotropic_remeshing_with_patch_ids-jtournois

PMP::isotropic_remeshing() - fix remeshing with patch ids
This commit is contained in:
Sebastien Loriot 2020-03-16 15:00:26 +01:00 committed by GitHub
commit fb6c32da8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View File

@ -1523,7 +1523,9 @@ private:
// tag patch border halfedges
BOOST_FOREACH(halfedge_descriptor h, halfedges(mesh_))
{
if (status(h)==PATCH && status(opposite(h, mesh_))!=PATCH)
if (status(h) == PATCH
&& ( status(opposite(h, mesh_)) != PATCH
|| get_patch_id(face(h, mesh_)) != get_patch_id(face(opposite(h, mesh_), mesh_))))
{
set_status(h, PATCH_BORDER);
has_border_ = true;

View File

@ -611,7 +611,6 @@ public Q_SLOTS:
}
if (fpmap_valid)
{
PMP::connected_components(pmesh, fpmap, PMP::parameters::edge_is_constrained_map(eif));
poly_item->setItemIsMulticolor(true);
poly_item->show_feature_edges(true);
}