Reordered to avoid weird logic.

This commit is contained in:
Joseph Lenox 2018-07-25 22:44:24 -05:00
parent 11f85a490a
commit 347143e344

View File

@ -383,9 +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 ((print.has_infinite_skirt() || _skirt_done.size() == 0 || (_skirt_done.rbegin())->first < print.config.skirt_height)
if (layer->id() < static_cast<size_t>(obj.config.raft_layers)
|| ((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<size_t>(obj.config.raft_layers)) {
&& typeid(layer) != typeid(SupportLayer*)) ) {
gcodegen.set_origin(Pointf(0,0));