From bb7d82622a92358ff1bffe4e84595e2f1c5801a6 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Wed, 25 Jul 2018 19:13:44 -0500 Subject: [PATCH] Accidentally inverted the logic in the first draft. --- xs/src/libslic3r/PrintGCode.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xs/src/libslic3r/PrintGCode.cpp b/xs/src/libslic3r/PrintGCode.cpp index 40d118953..44e3289e7 100644 --- a/xs/src/libslic3r/PrintGCode.cpp +++ b/xs/src/libslic3r/PrintGCode.cpp @@ -383,10 +383,10 @@ PrintGCode::process_layer(size_t idx, const Layer* layer, const Points& copies) // extrude skirt along raft layers and normal obj layers // (not along interlaced support material layers) - if (!_skirt_done.size() == 0 && (print.has_infinite_skirt() || (_skirt_done.rbegin())->first < print.config.skirt_height) - && typeid(layer) != typeid(SupportLayer*) - && _skirt_done.count(scale_(layer->print_z)) > 0 - && layer->id() < static_cast(obj.config.raft_layers)) { + if ((print.has_infinite_skirt() || _skirt_done.size() == 0 || (_skirt_done.rbegin())->first < print.config.skirt_height) + && _skirt_done.count(scale_(layer->print_z)) == 0 + && typeid(layer) != typeid(SupportLayer*) || layer->id() < static_cast(obj.config.raft_layers)) { + gcodegen.set_origin(Pointf(0,0)); gcodegen.avoid_crossing_perimeters.use_external_mp = true;