Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer

This commit is contained in:
enricoturri1966 2020-04-29 12:53:55 +02:00
commit 05e4476808
76 changed files with 16873 additions and 901 deletions

View file

@ -44,7 +44,7 @@ enum PrintStep {
enum PrintObjectStep {
posSlice, posPerimeters, posPrepareInfill,
posInfill, posSupportMaterial, posCount,
posInfill, posIroning, posSupportMaterial, posCount,
};
// A PrintRegion object represents a group of volumes to print
@ -226,6 +226,7 @@ private:
void make_perimeters();
void prepare_infill();
void infill();
void ironing();
void generate_support_material();
void _slice(const std::vector<coordf_t> &layer_height_profile);