diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2018-09-05 10:19:36 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2018-09-05 10:19:36 +0300 |
| commit | d41b7a3749a02caa6cf2c66c89608344ef0efb40 (patch) | |
| tree | 8602dcd175958c5cc2fd0fed6dd23e546bc140b7 /xs/src/libslic3r | |
| parent | 6b1b2bad76b87cfd9e1f5ef511e11a6ce0b5ddeb (diff) | |
| parent | 87c5c8e7f6de6e6773baa590ca43edb4fc71f5ac (diff) | |
Merge branch 'dev' of https://github.com/prusa3d/Slic3r into dev
Diffstat (limited to 'xs/src/libslic3r')
| -rw-r--r-- | xs/src/libslic3r/Model.cpp | 3 | ||||
| -rw-r--r-- | xs/src/libslic3r/Model.hpp | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/xs/src/libslic3r/Model.cpp b/xs/src/libslic3r/Model.cpp index 36c210844..6ad8ebb49 100644 --- a/xs/src/libslic3r/Model.cpp +++ b/xs/src/libslic3r/Model.cpp @@ -237,7 +237,6 @@ BoundingBoxf3 Model::bounding_box() const void Model::center_instances_around_point(const Vec2d &point) { -// BoundingBoxf3 bb = this->bounding_box(); BoundingBoxf3 bb; for (ModelObject *o : this->objects) for (size_t i = 0; i < o->instances.size(); ++ i) @@ -995,7 +994,7 @@ BoundingBoxf3 ModelInstance::transform_mesh_bounding_box(const TriangleMesh* mes { // Rotate around mesh origin. TriangleMesh copy(*mesh); - copy.transform(world_matrix(dont_translate, false, true).cast<float>()); + copy.transform(world_matrix(true, false, true).cast<float>()); BoundingBoxf3 bbox = copy.bounding_box(); if (!empty(bbox)) { diff --git a/xs/src/libslic3r/Model.hpp b/xs/src/libslic3r/Model.hpp index 66b53618a..bbfd2bde2 100644 --- a/xs/src/libslic3r/Model.hpp +++ b/xs/src/libslic3r/Model.hpp @@ -224,7 +224,6 @@ public: friend class ModelObject; -// Transform3d transform; double rotation; // Rotation around the Z axis, in radians around mesh center point double scaling_factor; Vec2d offset; // in unscaled coordinates |