Merge branch 'master' into dynamic-flow

Conflicts:
	lib/Slic3r/Flow.pm
	lib/Slic3r/Layer.pm
This commit is contained in:
Alessandro Ranellucci 2012-10-04 15:23:08 +02:00
commit b92642459f
32 changed files with 1469 additions and 1147 deletions

View file

@ -99,7 +99,7 @@ sub make_fill {
# add spacing between adjacent surfaces
{
my $distance = scale $layer->infill_flow->spacing / 2;
my $distance = $layer->infill_flow->scaled_spacing / 2;
my @offsets = ();
foreach my $surface (@surfaces) {
my $expolygon = $surface->expolygon;