3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-25 07:34:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

WipingExtrusions functions now don't need a reference to LayerTools

Browse source
This commit is contained in:
Lukas Matena 2018-07-11 14:46:13 +02:00
parent 2454c566ff
commit 1a2223a0a5
5 changed files with 46 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

11
xs/src/libslic3r/Print.hpp
View file

@ -286,6 +286,9 @@ public:
bool has_support_material() const;
void auto_assign_extruders(ModelObject* model_object) const;
// Returns extruder this eec should be printed with, according to PrintRegion config:
static int get_extruder(const ExtrusionEntityCollection& fill, const PrintRegion &region);
void _make_skirt();
void _make_brim();
@ -323,14 +326,6 @@ private:
};
// Returns extruder this eec should be printed with, according to PrintRegion config
static int get_extruder(const ExtrusionEntityCollection& fill, const PrintRegion &region) {
return is_infill(fill.role()) ? std::max<int>(0, (is_solid_infill(fill.entities.front()->role()) ? region.config.solid_infill_extruder : region.config.infill_extruder) - 1) :
std::max<int>(region.config.perimeter_extruder.value - 1, 0);
}
#define FOREACH_BASE(type, container, iterator) for (type::const_iterator iterator = (container).begin(); iterator != (container).end(); ++iterator)
#define FOREACH_REGION(print, region) FOREACH_BASE(PrintRegionPtrs, (print)->regions, region)
#define FOREACH_OBJECT(print, object) FOREACH_BASE(PrintObjectPtrs, (print)->objects, object)