Merge branch 'master' into avoid-crossing-perimeters

2012-09-21 15:36:45 +02:00
parent cc8d8bd26f f638558167
commit c95cd5ac38
12 changed files with 391 additions and 240 deletions
--- a/lib/Slic3r/Config.pm
+++ b/lib/Slic3r/Config.pm
@@ -1141,6 +1141,15 @@ sub replace_options {
    return $string;
 }

+# min object distance is max(duplicate_distance, clearance_radius)
+sub min_object_distance {
+    my $self = shift;
+    
+    return ($self->complete_objects && $self->extruder_clearance_radius > $self->duplicate_distance)
+        ? $self->extruder_clearance_radius
+        : $self->duplicate_distance;
+}
+
 # CLASS METHODS:

 sub write_ini {