Merge remote-tracking branch 'origin/master' into ys_color_print_extension
This commit is contained in:
commit
c564f693e9
89 changed files with 5205 additions and 1103 deletions
src/slic3r/GUI
|
@ -634,7 +634,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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue