From 03e7265cefd98fbd3b5e8a007aea6e54e6f2cb20 Mon Sep 17 00:00:00 2001 From: Jane Tournois Date: Mon, 16 Oct 2017 13:04:42 +0200 Subject: [PATCH] a Polyhedron_3 does not have an internal pmap for face_patch_id_t so the condition was always returning false for a Polyhedron we are inside the demo, so this condition can be safely removed --- .../internal/Isotropic_remeshing/remesh_impl.h | 3 +++ .../Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h index 2ee5141fdf8..e6a0f47103e 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/internal/Isotropic_remeshing/remesh_impl.h @@ -189,6 +189,9 @@ namespace internal { patch_ids_map = CGAL::internal::add_property(Face_property_tag("PMP_patch_id"), pmesh); if (do_init) { +#ifdef CGAL_PMP_REMESHING_VERBOSE + std::cout << "Compute connected components property map." << std::endl; +#endif nb_cc = PMP::connected_components(pmesh, patch_ids_map, diff --git a/Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp b/Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp index eb404da32ee..d0b20dcb040 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp +++ b/Polyhedron/demo/Polyhedron/Plugins/PMP/Isotropic_remeshing_plugin.cpp @@ -348,11 +348,9 @@ public Q_SLOTS: reset_face_ids(pmesh); - Patch_id_pmap fpmap; + Patch_id_pmap fpmap = get(CGAL::face_patch_id_t(), pmesh); bool fpmap_valid = false; - if(boost::graph_has_property()>::type::value) { - fpmap = get(CGAL::face_patch_id_t(), *poly_item->polyhedron()); BOOST_FOREACH(face_descriptor f, faces(pmesh)) { if (get(fpmap, f) != 1)