Merge branch 'master' into avoid-crossing-perimeters

This commit is contained in:
Alessandro Ranellucci 2012-09-21 15:36:45 +02:00
commit c95cd5ac38
12 changed files with 391 additions and 240 deletions

View file

@ -6,7 +6,7 @@ use warnings;
use parent 'Slic3r::Polyline';
use Slic3r::Geometry qw(polygon_lines polygon_remove_parallel_continuous_edges
scale polygon_remove_acute_vertices polygon_segment_having_point point_in_polygon);
polygon_remove_acute_vertices polygon_segment_having_point point_in_polygon);
use Slic3r::Geometry::Clipper qw(JT_MITER);
sub lines {
@ -116,7 +116,7 @@ sub is_printable {
# detect them and we would be discarding them.
my $p = $self->clone;
$p->make_counter_clockwise;
return $p->offset(scale($flow_width || $Slic3r::flow->width) / 2) ? 1 : 0;
return $p->offset(Slic3r::Geometry::scale($flow_width || $Slic3r::flow->width) / 2) ? 1 : 0;
}
sub is_valid {