diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2018-08-27 15:00:53 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2018-08-27 15:00:53 +0300 |
| commit | fef5a5252e86e08a0d3bf805d62f1b6db36ce612 (patch) | |
| tree | 8bf3adb74c9cabca6c5d1d466b8aba77a2f57a9f /xs/src/libslic3r/Model.hpp | |
| parent | 220d430956f353d78abbbed44b33104df07bb737 (diff) | |
| parent | 4522811f5bae9ca3a66270ad7f51ac39e0cb6e47 (diff) | |
Fixed conflicts after merging with master
Diffstat (limited to 'xs/src/libslic3r/Model.hpp')
| -rw-r--r-- | xs/src/libslic3r/Model.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xs/src/libslic3r/Model.hpp b/xs/src/libslic3r/Model.hpp index 468e6f833..140a0270a 100644 --- 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; |