From f74b1c65475918629308f5638235215d9072430c Mon Sep 17 00:00:00 2001 From: YuSanka Date: Mon, 8 Jun 2020 12:36:42 +0200 Subject: [PATCH] Added uncommitted changes --- src/libslic3r/GCode/ToolOrdering.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libslic3r/GCode/ToolOrdering.cpp b/src/libslic3r/GCode/ToolOrdering.cpp index 43f498b60..74f061e4e 100644 --- a/src/libslic3r/GCode/ToolOrdering.cpp +++ b/src/libslic3r/GCode/ToolOrdering.cpp @@ -492,7 +492,7 @@ void ToolOrdering::assign_custom_gcodes(const Print &print) for (unsigned int i : lt.extruders) extruder_printing_above[i] = true; // Skip all custom G-codes above this layer and skip all extruder switches. - for (; custom_gcode_it != custom_gcode_per_print_z.gcodes.rend() && (custom_gcode_it->print_z > lt.print_z + EPSILON || custom_gcode_it->gcode == ToolChangeCode); ++ custom_gcode_it); + for (; custom_gcode_it != custom_gcode_per_print_z.gcodes.rend() && (custom_gcode_it->print_z > lt.print_z + EPSILON || custom_gcode_it->type == CustomGCode::ToolChange); ++ custom_gcode_it); if (custom_gcode_it == custom_gcode_per_print_z.gcodes.rend()) // Custom G-codes were processed. break; @@ -504,8 +504,8 @@ void ToolOrdering::assign_custom_gcodes(const Print &print) print_z_below = it_lt_below->print_z; if (custom_gcode.print_z > print_z_below + 0.5 * EPSILON) { // The custom G-code applies to the current layer. - bool color_change = custom_gcode.gcode == ColorChangeCode; - bool tool_change = custom_gcode.gcode == ToolChangeCode; + bool color_change = custom_gcode.type == CustomGCode::ColorChange; + bool tool_change = custom_gcode.type == CustomGCode::ToolChange; bool pause_or_custom_gcode = ! color_change && ! tool_change; bool apply_color_change = ! ignore_tool_and_color_changes && // If it is color change, it will actually be useful as the exturder above will print.