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

@ -82,14 +82,6 @@ sub safety_offset {
);
}
sub offset_ex {
my $self = shift;
my @offsets = $self->offset(@_);
# apply holes to the right contours
return @{ union_ex(\@offsets) };
}
sub noncollapsing_offset_ex {
my $self = shift;
my ($distance, @params) = @_;