Fixed conflicts after merging with master

2018-08-27 14:00:53 +02:00
parent 220d430956 4522811f5b
commit fef5a5252e
38 changed files with 835 additions and 126 deletions
--- a/xs/src/libslic3r/Model.hpp
+++ b/xs/src/libslic3r/Model.hpp
@@ -121,7 +121,8 @@ public:
    void translate(coordf_t x, coordf_t y, coordf_t z);
    void scale(const Vec3d &versor);
    void rotate(float angle, const Axis &axis);
-    void transform(const float* matrix3x4);
+    void rotate(float angle, const Vec3d& axis);
+    void transform(const float* matrix3x4); // <<<<<<<<< FIXME (using eigen)
    void mirror(const Axis &axis);
    size_t materials_count() const;
    size_t facets_count() const;