diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 61ee7e1b8e..bb3bd28442 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -1897,7 +1897,7 @@ void ObjectList::part_selection_changed() if (item) { wxGetApp().obj_manipul()->get_og()->set_value("object_name", m_objects_model->GetName(item)); - wxGetApp().obj_manipul()->update_warning_icon_state(/*get_mesh_errors_list(obj_idx, volume_id)*/); + wxGetApp().obj_manipul()->update_warning_icon_state(get_mesh_errors_list(obj_idx, volume_id)); } } diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp index bb6eec9636..b8c37dcd04 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp @@ -66,7 +66,7 @@ ObjectManipulation::ObjectManipulation(wxWindow* parent) : return; wxGetApp().obj_list()->fix_through_netfabb(); - update_warning_icon_state(/*wxGetApp().obj_list()->get_mesh_errors_list()*/); + update_warning_icon_state(wxGetApp().obj_list()->get_mesh_errors_list()); }); return sizer; @@ -364,17 +364,14 @@ void ObjectManipulation::emulate_kill_focus() else on_change(option, 0); } +#endif // __APPLE__ -void ObjectManipulation::update_warning_icon_state(/*const wxString& tooltip*/) +void ObjectManipulation::update_warning_icon_state(const wxString& tooltip) { - const wxString& tooltip = wxGetApp().obj_list()->get_mesh_errors_list(); - m_fix_throught_netfab_bitmap->SetBitmap(tooltip.IsEmpty() ? wxNullBitmap : m_manifold_warning_bmp.bmp()); m_fix_throught_netfab_bitmap->SetToolTip(tooltip); } -#endif // __APPLE__ - void ObjectManipulation::reset_settings_value() { m_new_position = Vec3d::Zero(); diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.hpp b/src/slic3r/GUI/GUI_ObjectManipulation.hpp index 1bff4e22fc..f86cd6e563 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.hpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.hpp @@ -111,7 +111,7 @@ public: void emulate_kill_focus(); #endif // __APPLE__ - void update_warning_icon_state(/*const wxString& tooltip*/); + void update_warning_icon_state(const wxString& tooltip); void msw_rescale(); private: