Limit first object layer height correctly when using a larger support material extruder. #2722

xs/src/libslic3r/Print.cpp

@@ -300,7 +300,7 @@ Print::step_done(PrintObjectStep step) const
 
 // returns 0-based indices of used extruders
 std::set<size_t>
-Print::extruders() const
+Print::object_extruders() const
 {
     std::set<size_t> extruders;
     
@@ -316,6 +316,17 @@ Print::extruders() const
         if ((*region)->config.top_solid_layers.value > 0 || (*region)->config.bottom_solid_layers.value > 0)
             extruders.insert((*region)->config.solid_infill_extruder - 1);
     }
+    
+    return extruders;
+}
+
+// returns 0-based indices of used extruders
+std::set<size_t>
+Print::extruders() const
+{
+    std::set<size_t> extruders = this->object_extruders();
+    
+    // add support material extruder(s)
     FOREACH_OBJECT(this, object) {
         if ((*object)->has_support_material()) {
             extruders.insert((*object)->config.support_material_extruder - 1);

xs/src/libslic3r/Print.hpp

@@ -198,6 +198,7 @@ class Print
     Flow brim_flow() const;
     Flow skirt_flow() const;
     
+    std::set<size_t> object_extruders() const;
     std::set<size_t> extruders() const;
     void _simplify_slices(double distance);
     double max_allowed_layer_height() const;

xs/xsp/Print.xsp

@@ -161,6 +161,14 @@ _constant()
     void set_step_started(PrintStep step)
         %code%{ THIS->state.set_started(step); %};
     
+    std::vector<int> object_extruders()
+        %code%{
+            std::set<size_t> extruders = THIS->object_extruders();
+            RETVAL.reserve(extruders.size());
+            for (std::set<size_t>::const_iterator e = extruders.begin(); e != extruders.end(); ++e) {
+                RETVAL.push_back(*e);
+            }
+        %};
     std::vector<int> extruders()
         %code%{
             std::set<size_t> extruders = THIS->extruders();