From 07943ae669079d59209bd0140741a549894548c4 Mon Sep 17 00:00:00 2001
From: Enrico Turri <enricoturri@seznam.cz>
Date: Fri, 14 Dec 2018 09:52:15 +0100
Subject: [PATCH 1/2] Fixed import from 3mf of rotated models

---
 src/libslic3r/Format/3mf.cpp | 2 +-
 src/libslic3r/Model.cpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libslic3r/Format/3mf.cpp b/src/libslic3r/Format/3mf.cpp
index 6356fa17a..f5750162f 100644
--- a/src/libslic3r/Format/3mf.cpp
+++ b/src/libslic3r/Format/3mf.cpp
@@ -1876,7 +1876,7 @@ namespace Slic3r {
             vertices_count += stl.stats.shared_vertices;
 
 #if ENABLE_MODELVOLUME_TRANSFORM
-            Transform3d matrix = volume->get_matrix();
+            const Transform3d& matrix = volume->get_matrix();
 #endif // ENABLE_MODELVOLUME_TRANSFORM
 
             for (int i = 0; i < stl.stats.shared_vertices; ++i)
diff --git a/src/libslic3r/Model.cpp b/src/libslic3r/Model.cpp
index b02153128..07f1b98c1 100644
--- a/src/libslic3r/Model.cpp
+++ b/src/libslic3r/Model.cpp
@@ -512,7 +512,7 @@ void Model::adjust_min_z()
             {
                 coordf_t obj_min_z = obj->bounding_box().min(2);
                 if (obj_min_z < 0.0)
-                    obj->translate(0.0, 0.0, -obj_min_z);
+                    obj->translate_instances(Vec3d(0.0, 0.0, -obj_min_z));
             }
         }
     }

From 2d29b7d6cd061add96ebb01f5d19dc1bdcd9c024 Mon Sep 17 00:00:00 2001
From: tamasmeszaros <meszaros.q@gmail.com>
Date: Fri, 14 Dec 2018 09:57:48 +0100
Subject: [PATCH 2/2] Fix msvc build

---
 src/libslic3r/SLA/SLABasePool.hpp | 3 ++-
 src/libslic3r/SLAPrint.cpp        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libslic3r/SLA/SLABasePool.hpp b/src/libslic3r/SLA/SLABasePool.hpp
index 07a76265a..62c4971eb 100644
--- a/src/libslic3r/SLA/SLABasePool.hpp
+++ b/src/libslic3r/SLA/SLABasePool.hpp
@@ -7,11 +7,12 @@
 namespace Slic3r {
 
 class ExPolygon;
+using ExPolygons = std::vector<ExPolygon>;
+
 class TriangleMesh;
 
 namespace sla {
 
-using ExPolygons = std::vector<ExPolygon>;
 using ThrowOnCancel = std::function<void(void)>;
 
 /// Calculate the polygon representing the silhouette from the specified height
diff --git a/src/libslic3r/SLAPrint.cpp b/src/libslic3r/SLAPrint.cpp
index 328dc5483..0c61b591b 100644
--- a/src/libslic3r/SLAPrint.cpp
+++ b/src/libslic3r/SLAPrint.cpp
@@ -564,7 +564,7 @@ void SLAPrint::process()
             if(!po.m_config.supports_enable.getBool()) elevation = 0;
             sla::PoolConfig pcfg(wt, h, md, er);
 
-            sla::ExPolygons bp;
+            ExPolygons bp;
             double pad_h = sla::get_pad_elevation(pcfg);
             auto&& trmesh = po.transformed_mesh();