From 217a6f252587d61c4cb225147c39b1650f07dc49 Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Sun, 17 Jun 2012 19:36:02 +0200
Subject: [PATCH] Bugfix: any retraction_lift value different from "0" caused
 no retraction before layer changes. #453

---
 lib/Slic3r/Extruder.pm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/Slic3r/Extruder.pm b/lib/Slic3r/Extruder.pm
index 6094e53e7..20fb56786 100644
--- a/lib/Slic3r/Extruder.pm
+++ b/lib/Slic3r/Extruder.pm
@@ -227,13 +227,13 @@ sub retract {
         # combine Z change and retraction
         my $travel = [undef, $params{move_z}, $retract->[2], 'change layer and retract'];
         $gcode .= $self->G0(@$travel);
-    } elsif (defined $params{move_z} && $Slic3r::retract_lift) {
-        my $travel = [undef, $params{move_z} + $Slic3r::retract_lift, 0, 'move to next layer (' . $self->layer->id . ') and lift'];
-        $gcode .= $self->G0(@$travel);
-        $self->lifted(1);
     } else {
         $gcode .= $self->G1(@$retract);
-        if ($lift) {
+        if (defined $params{move_z} && $Slic3r::retract_lift > 0) {
+            my $travel = [undef, $params{move_z} + $Slic3r::retract_lift, 0, 'move to next layer (' . $self->layer->id . ') and lift'];
+            $gcode .= $self->G0(@$travel);
+            $self->lifted(1);
+        } elsif ($lift) {
             $gcode .= $self->G1(@$lift);
         }
     }