diff options
Diffstat (limited to 'src/libslic3r/Fill/Fill.cpp')
| -rw-r--r-- | src/libslic3r/Fill/Fill.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libslic3r/Fill/Fill.cpp b/src/libslic3r/Fill/Fill.cpp index d09a9b9b6..93360eb75 100644 --- a/src/libslic3r/Fill/Fill.cpp +++ b/src/libslic3r/Fill/Fill.cpp @@ -413,9 +413,9 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive: m_regions[region_id]->fills.append(fills_by_priority[0]->entities); delete fills_by_priority[0]; } else { - m_regions[region_id]->fills.no_sort = true; + m_regions[region_id]->fills.set_can_sort_reverse(false, false); ExtrusionEntityCollection* eec = new ExtrusionEntityCollection(); - eec->no_sort = true; + eec->set_can_sort_reverse(false, false); m_regions[region_id]->fills.entities.push_back(eec); for (ExtrusionEntityCollection* per_priority : fills_by_priority) { if (!per_priority->entities.empty()) @@ -580,9 +580,9 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive: for (LayerRegion *layerm : m_regions) for (const ExtrusionEntity *thin_fill : layerm->thin_fills.entities) { ExtrusionEntityCollection *collection = new ExtrusionEntityCollection(); - if (layerm->fills.no_sort && layerm->fills.entities.size() > 0 && layerm->fills.entities[0]->is_collection()) { + if (!layerm->fills.can_sort() && layerm->fills.entities.size() > 0 && layerm->fills.entities[0]->is_collection()) { ExtrusionEntityCollection* no_sort_fill = static_cast<ExtrusionEntityCollection*>(layerm->fills.entities[0]); - if (no_sort_fill->no_sort && no_sort_fill->entities.size() > 0 && no_sort_fill->entities[0]->is_collection()) + if (!no_sort_fill->can_sort() && no_sort_fill->entities.size() > 0 && no_sort_fill->entities[0]->is_collection()) static_cast<ExtrusionEntityCollection*>(no_sort_fill->entities[0])->entities.push_back(collection); } else layerm->fills.entities.push_back(collection); @@ -593,7 +593,7 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive: for (LayerRegion *layerm : m_regions) for (size_t i1 = 0; i1 < layerm->fills.entities.size(); ++i1) { assert(dynamic_cast<ExtrusionEntityCollection*>(layerm->fills.entities[i1]) != nullptr); - if (layerm->fills.no_sort && layerm->fills.entities.size() > 0 && i1 == 0){ + if (!layerm->fills.can_sort() && layerm->fills.entities.size() > 0 && i1 == 0){ ExtrusionEntityCollection* no_sort_fill = static_cast<ExtrusionEntityCollection*>(layerm->fills.entities[0]); assert(no_sort_fill != nullptr); assert(!no_sort_fill->empty()); @@ -601,7 +601,7 @@ void Layer::make_fills(FillAdaptive::Octree* adaptive_fill_octree, FillAdaptive: ExtrusionEntityCollection* priority_fill = dynamic_cast<ExtrusionEntityCollection*>(no_sort_fill->entities[i2]); assert(priority_fill != nullptr); assert(!priority_fill->empty()); - if (no_sort_fill->no_sort) { + if (!no_sort_fill->can_sort()) { for (size_t i3 = 0; i3 < priority_fill->entities.size(); ++i3) assert(dynamic_cast<ExtrusionEntityCollection*>(priority_fill->entities[i3]) != nullptr); } @@ -780,7 +780,7 @@ void Layer::make_ironing() ExtrusionEntityCollection *eec = new ExtrusionEntityCollection(); ironing_params.layerm->ironings.entities.push_back(eec); // Don't sort the ironing infill lines as they are monotonicly ordered. - eec->no_sort = true; + eec->set_can_sort_reverse(false, false); extrusion_entities_append_paths( eec->entities, std::move(polylines), erIroning, |