Merge remote-tracking branch 'remotes/origin/master' into vb_print_regions

This commit is contained in:
Vojtech Bubnik 2021-05-31 14:05:53 +02:00
commit 033d9f3a5e
38 changed files with 1502 additions and 587 deletions

View file

@ -781,11 +781,9 @@ bool GLGizmosManager::on_char(wxKeyEvent& evt)
break;
}
#ifdef __APPLE__
case WXK_BACK: // the low cost Apple solutions are not equipped with a Delete key, use Backspace instead.
#else /* __APPLE__ */
case WXK_BACK:
case WXK_DELETE:
#endif /* __APPLE__ */
{
if ((m_current == SlaSupports || m_current == Hollow) && gizmo_event(SLAGizmoEventType::Delete))
processed = true;