songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cgal/5.3.x-branch'

This commit is contained in:
Sébastien Loriot 2021-08-25 10:46:19 +02:00
parent c2255e6954 f1aa145fd4
commit fb1cef4d8f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.cpp
View File

@ -1130,7 +1130,7 @@ bool Scene_polyhedron_selection_item:: treat_selection(const std::set<fg_edge_de
case 3:
if(out_degree(source(halfedge(ed,*polyhedron()),*polyhedron()),*polyhedron())<3 ||
out_degree(target(halfedge(ed,*polyhedron()),*polyhedron()),*polyhedron())<3)
d->tempInstructions("Faces not joined : the two ends of the edge must have a degree of at least 3.",
d->tempInstructions("Faces not joined : the two endpoints of the edge must have a degree of at least 3.",
"Select the edge separating the faces you want to join."
"Warning: this operation will clear the undo stack.");
else
@ -1160,7 +1160,7 @@ bool Scene_polyhedron_selection_item:: treat_selection(const std::set<fg_edge_de
}
else if(!CGAL::Euler::does_satisfy_link_condition(ed, *polyhedron()))
{
d->tempInstructions("Edge not collapsed : link condition not satidfied.",
d->tempInstructions("Edge not collapsed : link condition not satisfied.",
"Select the edge you want to collapse.");
}
else