diff options
Diffstat (limited to 'src/libslic3r/Fill/Fill.cpp')
| -rw-r--r-- | src/libslic3r/Fill/Fill.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/libslic3r/Fill/Fill.cpp b/src/libslic3r/Fill/Fill.cpp index cef9f42d4..a3e4aee31 100644 --- a/src/libslic3r/Fill/Fill.cpp +++ b/src/libslic3r/Fill/Fill.cpp @@ -274,13 +274,8 @@ std::vector<SurfaceFill> group_fills(const Layer &layer) } if (internal_solid_fill == nullptr) { // Produce another solid fill. -<<<<<<< HEAD - params.extruder = layerm.region()->extruder(frSolidInfill); - params.pattern = layerm.region()->config().top_fill_pattern == ipMonotonic ? ipMonotonic : ipRectilinear; -======= params.extruder = layerm.region().extruder(frSolidInfill); params.pattern = layerm.region().config().top_fill_pattern == ipMonotonic ? ipMonotonic : ipRectilinear; ->>>>>>> master params.density = 100.f; params.extrusion_role = erInternalInfill; params.angle = float(Geometry::deg2rad(layerm.region().config().fill_angle.value)); |