From 2e5e5983be56b1c9ee52df022fb54e771c2aedce Mon Sep 17 00:00:00 2001 From: Alessandro Ranellucci Date: Sun, 24 Jun 2012 20:58:12 +0200 Subject: [PATCH] Don't reset E when the makerbot flavor is selected --- lib/Slic3r/Extruder.pm | 2 +- lib/Slic3r/ExtrusionPath.pm | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/Slic3r/Extruder.pm b/lib/Slic3r/Extruder.pm index 2e357cac7..1ac5ed8a8 100644 --- a/lib/Slic3r/Extruder.pm +++ b/lib/Slic3r/Extruder.pm @@ -242,7 +242,7 @@ sub retract { # reset extrusion distance during retracts # this makes sure we leave sufficient precision in the firmware - if (!$Slic3r::use_relative_e_distances && $Slic3r::gcode_flavor ne 'mach3') { + if (!$Slic3r::use_relative_e_distances && $Slic3r::gcode_flavor !~ /^(?:mach3|makerbot)$/) { $gcode .= "G92 " . $Slic3r::extrusion_axis . "0\n" if $Slic3r::extrusion_axis; $self->extrusion_distance(0); } diff --git a/lib/Slic3r/ExtrusionPath.pm b/lib/Slic3r/ExtrusionPath.pm index 6a2df2740..fe8089127 100644 --- a/lib/Slic3r/ExtrusionPath.pm +++ b/lib/Slic3r/ExtrusionPath.pm @@ -27,12 +27,13 @@ has 'role' => (is => 'rw', required => 1); use constant EXTR_ROLE_PERIMETER => 0; use constant EXTR_ROLE_SMALLPERIMETER => 1; use constant EXTR_ROLE_CONTOUR_INTERNAL_PERIMETER => 2; -use constant EXTR_ROLE_FILL => 3; -use constant EXTR_ROLE_SOLIDFILL => 4; -use constant EXTR_ROLE_TOPSOLIDFILL => 5; -use constant EXTR_ROLE_BRIDGE => 6; -use constant EXTR_ROLE_SKIRT => 7; -use constant EXTR_ROLE_SUPPORTMATERIAL => 8; +use constant EXTR_ROLE_EXTERNAL_PERIMETER => 3; +use constant EXTR_ROLE_FILL => 4; +use constant EXTR_ROLE_SOLIDFILL => 5; +use constant EXTR_ROLE_TOPSOLIDFILL => 6; +use constant EXTR_ROLE_BRIDGE => 7; +use constant EXTR_ROLE_SKIRT => 8; +use constant EXTR_ROLE_SUPPORTMATERIAL => 9; sub BUILD { my $self = shift;