Merge branch 'master' into sender

Conflicts:
	Build.PL
	lib/Slic3r/GUI/MainFrame.pm

xs/xsp/ExtrusionEntityCollection.xsp

@@ -7,6 +7,8 @@
 
 %name{Slic3r::ExtrusionPath::Collection} class ExtrusionEntityCollection {
     %name{_new} ExtrusionEntityCollection();
+    Clone<ExtrusionEntityCollection> clone()
+        %code{% RETVAL = THIS->clone(); %};
     void reverse();
     void clear()
         %code{% THIS->entities.clear(); %};
@@ -24,6 +26,8 @@
     Clone<Point> last_point();
     int count()
         %code{% RETVAL = THIS->entities.size(); %};
+    int items_count()
+        %code{% RETVAL = THIS->items_count(); %};
     bool empty()
         %code{% RETVAL = THIS->entities.empty(); %};
     std::vector<size_t> orig_indices()

xs/xsp/Geometry.xsp

@@ -8,6 +8,9 @@
 
 %package{Slic3r::Geometry};
 
+Pointfs arrange(size_t total_parts, Pointf* part, coordf_t dist, BoundingBoxf* bb)
+    %code{% RETVAL = Slic3r::Geometry::arrange(total_parts, *part, dist, *bb); %};
+
 %{
 
 bool
@@ -87,4 +90,17 @@ simplify_polygons(polygons, tolerance)
     OUTPUT:
         RETVAL
 
+
+IV
+_constant()
+  ALIAS:
+    X           = X
+    Y           = Y
+    Z           = Z
+  PROTOTYPE:
+  CODE:
+    RETVAL = ix;
+  OUTPUT: RETVAL
+
 %}
+

xs/xsp/Layer.xsp

@@ -71,6 +71,7 @@
         %code%{ RETVAL = (int)(intptr_t)THIS; %};
     
     void make_slices();
+    void merge_slices();
     bool any_internal_region_slice_contains_polyline(Polyline* polyline)
         %code%{ RETVAL = THIS->any_internal_region_slice_contains(*polyline); %};
     bool any_bottom_region_slice_contains_polyline(Polyline* polyline)

xs/xsp/Model.xsp

@@ -182,6 +182,8 @@ ModelMaterial::attributes()
     void translate(double x, double y, double z);
     void scale_xyz(Pointf3* versor)
         %code{% THIS->scale(*versor); %};
+    void rotate(float angle, Axis axis);
+    void flip(Axis axis);
     
     Model* cut(double z)
         %code%{

xs/xsp/PlaceholderParser.xsp

@@ -14,6 +14,8 @@
     void apply_config(DynamicPrintConfig *config)
         %code%{ THIS->apply_config(*config); %};
     void set(std::string key, std::string value);
+    void set_multiple(std::string key, std::vector<std::string> values)
+        %code%{ THIS->set(key, values); %};
 
     void _single_set(std::string k, std::string v)
         %code%{ THIS->_single[k] = v; %};

xs/xsp/Print.xsp

@@ -161,6 +161,22 @@ _constant()
     void set_step_started(PrintStep step)
         %code%{ THIS->state.set_started(step); %};
     
+    std::vector<int> object_extruders()
+        %code%{
+            std::set<size_t> extruders = THIS->object_extruders();
+            RETVAL.reserve(extruders.size());
+            for (std::set<size_t>::const_iterator e = extruders.begin(); e != extruders.end(); ++e) {
+                RETVAL.push_back(*e);
+            }
+        %};
+    std::vector<int> support_material_extruders()
+        %code%{
+            std::set<size_t> extruders = THIS->support_material_extruders();
+            RETVAL.reserve(extruders.size());
+            for (std::set<size_t>::const_iterator e = extruders.begin(); e != extruders.end(); ++e) {
+                RETVAL.push_back(*e);
+            }
+        %};
     std::vector<int> extruders()
         %code%{
             std::set<size_t> extruders = THIS->extruders();

xs/xsp/my.map

@@ -188,6 +188,7 @@ Clone<BridgeDetector>      O_OBJECT_SLIC3R_T
 
 GLVertexArray*             O_OBJECT_SLIC3R
 
+Axis                  T_UV
 ExtrusionLoopRole     T_UV
 ExtrusionRole     T_UV
 FlowRole     T_UV

xs/xsp/typemap.xspt

@@ -176,6 +176,12 @@
 %typemap{SupportLayerPtrs*};
 
 
+%typemap{Axis}{parsed}{
+  %cpp_type{Axis};
+  %precall_code{%
+    $CVar = (Axis)SvUV($PerlVar);
+  %};
+};
 %typemap{SurfaceType}{parsed}{
   %cpp_type{SurfaceType};
   %precall_code{%