From 4c577043f4eefe6a74f6ca2e57d40facd7c1d82e Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Fri, 17 Mar 2017 18:53:13 +0100
Subject: [PATCH] Fixed tests broken by the spiral vase change

---
 lib/Slic3r/GCode/SpiralVase.pm | 2 ++
 lib/Slic3r/Print/GCode.pm      | 3 +--
 t/shells.t                     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/Slic3r/GCode/SpiralVase.pm b/lib/Slic3r/GCode/SpiralVase.pm
index 837e33d16f..d35e29e713 100644
--- a/lib/Slic3r/GCode/SpiralVase.pm
+++ b/lib/Slic3r/GCode/SpiralVase.pm
@@ -9,6 +9,8 @@ use Slic3r::Geometry qw(unscale);
 
 sub BUILD {
     my ($self) = @_;
+    
+    $self->reader->Z($self->config->z_offset);
     $self->reader->apply_print_config($self->config);
 }
 
diff --git a/lib/Slic3r/Print/GCode.pm b/lib/Slic3r/Print/GCode.pm
index 635a4b65fe..2617697162 100644
--- a/lib/Slic3r/Print/GCode.pm
+++ b/lib/Slic3r/Print/GCode.pm
@@ -324,8 +324,7 @@ sub process_layer {
     # check whether we're going to apply spiralvase logic
     if (defined $self->_spiral_vase) {
         $self->_spiral_vase->enable(
-            ($layer->id > 0 || $self->print->config->brim_width == 0
-                || $self->print->config->interior_brim_width == 0 || $self->print->config->brim_connections_width == 0)
+            $layer->id > 0
                 && ($self->print->config->skirts == 0
                     || ($layer->id >= $self->print->config->skirt_height && !$self->print->has_infinite_skirt))
                 && !defined(first { $_->region->config->bottom_solid_layers > $layer->id } @{$layer->regions})
diff --git a/t/shells.t b/t/shells.t
index 63eb1905d5..2347ff3662 100644
--- a/t/shells.t
+++ b/t/shells.t
@@ -186,7 +186,7 @@ use Slic3r::Test;
         my $first_layer_temperature_set = 0;
         my $temperature_set = 0;
         my @z_steps = ();
-        Slic3r::GCode::Reader->new->parse(Slic3r::Test::gcode($print), sub {
+        Slic3r::GCode::Reader->new(Z => $config->z_offset)->parse(Slic3r::Test::gcode($print), sub {
             my ($self, $cmd, $args, $info) = @_;
             
             if ($cmd eq 'G1') {