Fix regression in --complete-objects causing fatal error and/or wrong warnings about object heights
This commit is contained in:
parent
b71bc37111
commit
5843f5df6c
@ -188,10 +188,16 @@ sub validate {
|
|||||||
|
|
||||||
# check vertical clearance
|
# check vertical clearance
|
||||||
{
|
{
|
||||||
my @obj_copies = $self->object_copies;
|
my @object_height = ();
|
||||||
pop @obj_copies; # ignore the last copy: its height doesn't matter
|
foreach my $object (@{$self->objects}) {
|
||||||
my $scaled_clearance = scale $Slic3r::Config->extruder_clearance_height;
|
my $height = $object->size->[Z];
|
||||||
if (grep { +($_->size)[Z] > $scaled_clearance } map @{$self->objects->[$_->[0]]->meshes}, @obj_copies) {
|
push @object_height, $height for @{$object->copies};
|
||||||
|
}
|
||||||
|
@object_height = sort { $a <=> $b } @object_height;
|
||||||
|
# ignore the tallest *copy* (this is why we repeat height for all of them):
|
||||||
|
# it will be printed as last one so its height doesn't matter
|
||||||
|
pop @object_height;
|
||||||
|
if (max(@object_height) > scale $Slic3r::Config->extruder_clearance_height) {
|
||||||
die "Some objects are too tall and cannot be printed without extruder collisions.\n";
|
die "Some objects are too tall and cannot be printed without extruder collisions.\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -265,15 +271,6 @@ sub init_extruders {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
sub object_copies {
|
|
||||||
my $self = shift;
|
|
||||||
my @oc = ();
|
|
||||||
for my $obj_idx (0 .. $#{$self->objects}) {
|
|
||||||
push @oc, map [ $obj_idx, $_ ], @{$self->objects->[$obj_idx]->copies};
|
|
||||||
}
|
|
||||||
return @oc;
|
|
||||||
}
|
|
||||||
|
|
||||||
sub layer_count {
|
sub layer_count {
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
return max(map { scalar @{$_->layers} } @{$self->objects});
|
return max(map { scalar @{$_->layers} } @{$self->objects});
|
||||||
|
Loading…
Reference in New Issue
Block a user