Merge branch 'master' of https://github.com/prusa3d/Slic3r
This commit is contained in:
commit
d8cb1b0792
2 changed files with 4 additions and 0 deletions
|
@ -2313,6 +2313,9 @@ void GLCanvas3D::on_key(wxKeyEvent& evt)
|
|||
|
||||
void GLCanvas3D::on_mouse_wheel(wxMouseEvent& evt)
|
||||
{
|
||||
if (!m_initialized)
|
||||
return;
|
||||
|
||||
// Ignore the wheel events if the middle button is pressed.
|
||||
if (evt.MiddleIsDown())
|
||||
return;
|
||||
|
|
|
@ -2120,6 +2120,7 @@ void ObjectList::update_selections_on_canvas()
|
|||
add_to_selection(item, selection, instance_idx, true);
|
||||
|
||||
wxGetApp().plater()->canvas3D()->update_gizmos_on_off_state();
|
||||
wxGetApp().plater()->canvas3D()->render();
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue