From 34750d47fe2cbcfbbb8aaf09cafb1db957d765cb Mon Sep 17 00:00:00 2001
From: Alessandro Ranellucci <aar@cpan.org>
Date: Wed, 11 Jun 2014 22:15:28 +0200
Subject: [PATCH] Move external_perimeters_first to PrintRegionConfig

---
 lib/Slic3r/Layer/Region.pm | 2 +-
 xs/src/Print.cpp           | 3 ++-
 xs/src/PrintConfig.cpp     | 1 +
 xs/src/PrintConfig.hpp     | 6 +++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/Slic3r/Layer/Region.pm b/lib/Slic3r/Layer/Region.pm
index 8710bd880..90776834a 100644
--- a/lib/Slic3r/Layer/Region.pm
+++ b/lib/Slic3r/Layer/Region.pm
@@ -399,7 +399,7 @@ sub make_perimeters {
     # we continue inwards after having finished the brim
     # TODO: add test for perimeter order
     @loops = reverse @loops
-        if $self->print->config->external_perimeters_first
+        if $self->region->config->external_perimeters_first
             || ($self->layer->id == 0 && $self->print->config->brim_width > 0);
     
     # append perimeters
diff --git a/xs/src/Print.cpp b/xs/src/Print.cpp
index f7a34a98f..74cbfa5c2 100644
--- a/xs/src/Print.cpp
+++ b/xs/src/Print.cpp
@@ -205,7 +205,8 @@ PrintObject::invalidate_state_by_config_options(const std::vector<t_config_optio
             || *opt_key == "gap_fill_speed"
             || *opt_key == "overhangs"
             || *opt_key == "perimeter_extrusion_width"
-            || *opt_key == "thin_walls") {
+            || *opt_key == "thin_walls"
+            || *opt_key == "external_perimeters_first") {
             steps.insert(posPerimeters);
         } else if (*opt_key == "resolution"
             || *opt_key == "layer_height"
diff --git a/xs/src/PrintConfig.cpp b/xs/src/PrintConfig.cpp
index 782380802..388ddbab2 100644
--- a/xs/src/PrintConfig.cpp
+++ b/xs/src/PrintConfig.cpp
@@ -126,6 +126,7 @@ PrintConfigDef::build_def() {
 
     Options["external_perimeters_first"].type = coBool;
     Options["external_perimeters_first"].label = "External perimeters first";
+    Options["external_perimeters_first"].category = "Layers and Perimeters";
     Options["external_perimeters_first"].tooltip = "Print contour perimeters from the outermost one to the innermost one instead of the default inverse order.";
     Options["external_perimeters_first"].cli = "external-perimeters-first!";
 
diff --git a/xs/src/PrintConfig.hpp b/xs/src/PrintConfig.hpp
index 77a3cb8d6..6f05dd586 100644
--- a/xs/src/PrintConfig.hpp
+++ b/xs/src/PrintConfig.hpp
@@ -199,6 +199,7 @@ class PrintRegionConfig : public virtual StaticPrintConfig
     ConfigOptionFloat               bridge_speed;
     ConfigOptionFloatOrPercent      external_perimeter_extrusion_width;
     ConfigOptionFloatOrPercent      external_perimeter_speed;
+    ConfigOptionBool                external_perimeters_first;
     ConfigOptionBool                extra_perimeters;
     ConfigOptionInt                 fill_angle;
     ConfigOptionPercent             fill_density;
@@ -232,6 +233,7 @@ class PrintRegionConfig : public virtual StaticPrintConfig
         this->external_perimeter_extrusion_width.percent         = false;
         this->external_perimeter_speed.value                     = 70;
         this->external_perimeter_speed.percent                   = true;
+        this->external_perimeters_first.value                    = false;
         this->extra_perimeters.value                             = true;
         this->fill_angle.value                                   = 45;
         this->fill_density.value                                 = 40;
@@ -271,6 +273,7 @@ class PrintRegionConfig : public virtual StaticPrintConfig
         if (opt_key == "bridge_speed")                               return &this->bridge_speed;
         if (opt_key == "external_perimeter_extrusion_width")         return &this->external_perimeter_extrusion_width;
         if (opt_key == "external_perimeter_speed")                   return &this->external_perimeter_speed;
+        if (opt_key == "external_perimeters_first")                  return &this->external_perimeters_first;
         if (opt_key == "extra_perimeters")                           return &this->extra_perimeters;
         if (opt_key == "fill_angle")                                 return &this->fill_angle;
         if (opt_key == "fill_density")                               return &this->fill_density;
@@ -315,7 +318,6 @@ class PrintConfig : public virtual StaticPrintConfig
     ConfigOptionInt                 disable_fan_first_layers;
     ConfigOptionFloat               duplicate_distance;
     ConfigOptionString              end_gcode;
-    ConfigOptionBool                external_perimeters_first;
     ConfigOptionFloat               extruder_clearance_height;
     ConfigOptionFloat               extruder_clearance_radius;
     ConfigOptionPoints              extruder_offset;
@@ -387,7 +389,6 @@ class PrintConfig : public virtual StaticPrintConfig
         this->disable_fan_first_layers.value                     = 1;
         this->duplicate_distance.value                           = 6;
         this->end_gcode.value                                    = "M104 S0 ; turn off temperature\nG28 X0  ; home X axis\nM84     ; disable motors\n";
-        this->external_perimeters_first.value                    = false;
         this->extruder_clearance_height.value                    = 20;
         this->extruder_clearance_radius.value                    = 20;
         this->extruder_offset.values.resize(1);
@@ -476,7 +477,6 @@ class PrintConfig : public virtual StaticPrintConfig
         if (opt_key == "disable_fan_first_layers")                   return &this->disable_fan_first_layers;
         if (opt_key == "duplicate_distance")                         return &this->duplicate_distance;
         if (opt_key == "end_gcode")                                  return &this->end_gcode;
-        if (opt_key == "external_perimeters_first")                  return &this->external_perimeters_first;
         if (opt_key == "extruder_clearance_height")                  return &this->extruder_clearance_height;
         if (opt_key == "extruder_clearance_radius")                  return &this->extruder_clearance_radius;
         if (opt_key == "extruder_offset")                            return &this->extruder_offset;