Merge remote-tracking branch 'origin/master' into vb_undo_redo

2019-07-04 20:22:15 +02:00 · 2019-07-04 20:22:15 +02:00 · c7cc760067
commit c7cc760067
parent 1070991149 f617d74729
105 changed files with 3283 additions and 1599 deletions
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@ -1405,7 +1405,9 @@ void GCode::process_layer(
        m_colorprint_heights.erase(m_colorprint_heights.begin());
        colorprint_change = true;
    }
-    if (colorprint_change && print.extruders().size()==1)
+
+    // we should add or not colorprint_change in respect to nozzle_diameter count instead of really used extruders count
+    if (colorprint_change && print./*extruders()*/config().nozzle_diameter.size()==1)
        gcode += "M600\n";