3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-23 22:54:08 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'call_get_layer' of github.com:sapir/Slic3r into sapir-call_get_layer

Browse source 
Conflicts:
	lib/Slic3r/Print.pm
This commit is contained in:
Alessandro Ranellucci 2014-06-14 00:05:24 +02:00
commit e24b3a8916
4 changed files with 39 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/Slic3r/Print.pm
View file

@ -557,7 +557,7 @@ sub make_skirt {
? scalar(@{$object->layers})
: min($self->config->skirt_height, scalar(@{$object->layers}));
my $highest_layer = $object->layers->[$skirt_height-1];
my $highest_layer = $object->get_layer($skirt_height - 1);
$skirt_height_z = max($skirt_height_z, $highest_layer->print_z);
}
@ -685,7 +685,7 @@ sub make_brim {
my @islands = (); # array of polygons
foreach my $obj_idx (0 .. ($self->object_count - 1)) {
my $object = $self->objects->[$obj_idx];
my $layer0 = $object->layers->[0];
my $layer0 = $object->get_layer(0);
my @object_islands = (
(map $_->contour, @{$layer0->slices}),
);