Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail

This commit is contained in:
Enrico Turri 2019-10-22 16:03:27 +02:00
commit 1809497c38
6 changed files with 67 additions and 131 deletions

View file

@ -632,7 +632,11 @@ void ObjectManipulation::update_reset_buttons_visibility()
show_drop_to_bed = (std::abs(min_z) > EPSILON);
}
wxGetApp().CallAfter([this, show_rotation, show_scale, show_drop_to_bed]{
wxGetApp().CallAfter([this, show_rotation, show_scale, show_drop_to_bed] {
// There is a case (under OSX), when this function is called after the Manipulation panel is hidden
// So, let check if Manipulation panel is still shown for this moment
if (!this->IsShown())
return;
m_reset_rotation_button->Show(show_rotation);
m_reset_scale_button->Show(show_scale);
m_drop_to_bed_button->Show(show_drop_to_bed);