Fix of a crash when using selection rectangle with a gizmo open
This commit is contained in:
parent
28e2315e72
commit
ae14f677c2
@ -7347,12 +7347,13 @@ bool GLCanvas3D::_is_any_volume_outside() const
|
|||||||
void GLCanvas3D::_update_selection_from_hover()
|
void GLCanvas3D::_update_selection_from_hover()
|
||||||
{
|
{
|
||||||
bool ctrl_pressed = wxGetKeyState(WXK_CONTROL);
|
bool ctrl_pressed = wxGetKeyState(WXK_CONTROL);
|
||||||
|
bool selection_changed = false;
|
||||||
|
|
||||||
if (m_hover_volume_idxs.empty()) {
|
if (m_hover_volume_idxs.empty()) {
|
||||||
if (!ctrl_pressed && m_rectangle_selection.get_state() == GLSelectionRectangle::EState::Select)
|
if (!ctrl_pressed && m_rectangle_selection.get_state() == GLSelectionRectangle::EState::Select) {
|
||||||
|
selection_changed = ! m_selection.is_empty();
|
||||||
m_selection.remove_all();
|
m_selection.remove_all();
|
||||||
|
}
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GLSelectionRectangle::EState state = m_rectangle_selection.get_state();
|
GLSelectionRectangle::EState state = m_rectangle_selection.get_state();
|
||||||
@ -7365,7 +7366,6 @@ void GLCanvas3D::_update_selection_from_hover()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool selection_changed = false;
|
|
||||||
#if ENABLE_NEW_RECTANGLE_SELECTION
|
#if ENABLE_NEW_RECTANGLE_SELECTION
|
||||||
if (!m_rectangle_selection.is_empty()) {
|
if (!m_rectangle_selection.is_empty()) {
|
||||||
#endif // ENABLE_NEW_RECTANGLE_SELECTION
|
#endif // ENABLE_NEW_RECTANGLE_SELECTION
|
||||||
|
Loading…
Reference in New Issue
Block a user