3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 16:57:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

16
xs/src/libslic3r/Model.cpp
View file

@ -715,7 +715,21 @@ void ModelObject::scale(const Vec3d &versor)
this->invalidate_bounding_box();
}
void ModelObject::rotate(float angle, const Axis &axis)
void ModelObject::rotate(float angle, const Axis& axis)
{
for (ModelVolume *v : this->volumes)
{
v->mesh.rotate(angle, axis);
v->m_convex_hull.rotate(angle, axis);
}
center_around_origin();
this->origin_translation = Vec3d::Zero();
this->invalidate_bounding_box();
}
void ModelObject::rotate(float angle, const Vec3d& axis)
{
for (ModelVolume *v : this->volumes)
{