Fixed conflicts after merge with master
This commit is contained in:
commit
ca34518bcc
264 changed files with 69447 additions and 49874 deletions
|
@ -1054,7 +1054,7 @@ void GLGizmoHollow::select_point(int i)
|
|||
m_selected.assign(m_selected.size(), i == AllPoints);
|
||||
m_selection_empty = (i == NoPoints);
|
||||
|
||||
if (i == AllPoints) {
|
||||
if (i == AllPoints && !drain_holes.empty()) {
|
||||
m_new_hole_radius = drain_holes[0].radius;
|
||||
m_new_hole_height = drain_holes[0].height;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue