diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2018-09-05 10:11:58 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2018-09-05 10:11:58 +0300 |
| commit | 87c5c8e7f6de6e6773baa590ca43edb4fc71f5ac (patch) | |
| tree | f4bf623973f08b3d8bdfbddb98b79d38fd38a1f0 /xs/src/libslic3r | |
| parent | 15b13405141ca7481f156d204a917fab38c30dc1 (diff) | |
Renamed GLVolume member variables to match the corresponding ModelInstance ones
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 |