3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-15 02:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed conflicts after merging with master

Browse source
This commit is contained in:
Enrico Turri 2018-08-27 14:00:53 +02:00
commit fef5a5252e
38 changed files with 835 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

3
xs/src/libslic3r/Model.hpp
View file

@ -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;