Merge remote-tracking branch 'origin/master' into ys_selection

2019-04-04 15:09:37 +02:00 · 2019-04-04 15:09:37 +02:00 · 63dea6d5dc
commit 63dea6d5dc
parent 09054a0bc9 24128e01ed
43 changed files with 623 additions and 196 deletions
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@ -525,7 +525,6 @@ void ObjectList::key_event(wxKeyEvent& event)
        || event.GetKeyCode() == WXK_BACK
 #endif //__WXOSX__
        ) {
-        printf("WXK_BACK\n");
        remove();
    }
    else if (wxGetKeyState(wxKeyCode('A')) && wxGetKeyState(WXK_CONTROL/*WXK_SHIFT*/))