Merge remote-tracking branch 'remotes/origin/ys_preset_edit_buttons'

2019-03-19 17:37:02 +01:00 · 2019-03-19 17:37:02 +01:00 · 4d37c8658d
commit 4d37c8658d
parent 177e99c770 b7a1bd927a
4 changed files with 19 additions and 3 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) :