Merge remote-tracking branch 'origin/ys_preset_edit_buttons' into ys_comboboxes

2019-03-20 10:33:50 +01:00
parent c8af16630c dcaf901bc2
commit bc9d0e1f02
7 changed files with 78 additions and 20 deletions
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -51,8 +51,7 @@ static DynamicPrintConfig& printer_config()

 static int extruders_count()
 {
-    return printer_technology() == ptSLA ? 1 :
-        printer_config().option<ConfigOptionFloats>("nozzle_diameter")->values.size();
+    return wxGetApp().extruders_cnt();
 }

 ObjectList::ObjectList(wxWindow* parent) :