mirror of https://github.com/CGAL/cgal
Merge pull request #1482 from janetournois/Polyhedron_demo-fix_colors_isotropic_remeshing_plugin-jtournois
Polyhedron demo : fix colors or the remeshed polyhedron
This commit is contained in:
commit
8b95f0d8f6
|
|
@ -367,8 +367,6 @@ public Q_SLOTS:
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
selection_item->setItemIsMulticolor(true);
|
|
||||||
|
|
||||||
if (selection_item->selected_facets.empty() &&
|
if (selection_item->selected_facets.empty() &&
|
||||||
(!selection_item->selected_edges.empty() || !selection_item->selected_vertices.empty()))
|
(!selection_item->selected_edges.empty() || !selection_item->selected_vertices.empty()))
|
||||||
CGAL::Polygon_mesh_processing::isotropic_remeshing(
|
CGAL::Polygon_mesh_processing::isotropic_remeshing(
|
||||||
|
|
@ -395,8 +393,9 @@ public Q_SLOTS:
|
||||||
.vertex_is_constrained_map(selection_item->constrained_vertices_pmap())
|
.vertex_is_constrained_map(selection_item->constrained_vertices_pmap())
|
||||||
.face_patch_map(Patch_id_pmap<face_descriptor>()));
|
.face_patch_map(Patch_id_pmap<face_descriptor>()));
|
||||||
}
|
}
|
||||||
selection_item->polyhedron_item()->setColor(
|
if(!selection_item->polyhedron_item()->isItemMulticolor())
|
||||||
selection_item->polyhedron_item()->color());
|
selection_item->polyhedron_item()->setColor(
|
||||||
|
selection_item->polyhedron_item()->color());
|
||||||
selection_item->poly_item_changed();
|
selection_item->poly_item_changed();
|
||||||
selection_item->clear<face_descriptor>();
|
selection_item->clear<face_descriptor>();
|
||||||
selection_item->changed_with_poly_item();
|
selection_item->changed_with_poly_item();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue