diff options
author | Enrico Turri <enricoturri@seznam.cz> | 2019-05-10 12:14:42 +0300 |
---|---|---|
committer | Enrico Turri <enricoturri@seznam.cz> | 2019-05-10 12:14:42 +0300 |
commit | f0da19446b2978e26eb161e9627010c38cae7fb1 (patch) | |
tree | ee01bd9db12a4285b5811a2c137531ea14e05b08 /src/slic3r/GUI/3DScene.cpp | |
parent | 769f0144c2a220d0e105a651f0dc75d895f00f4d (diff) | |
parent | e9a53e49dba0c10aebad555cedb86d9be405ffd3 (diff) |
Merge branch 'lm_arrange_wipe_tower' of https://github.com/prusa3d/Slic3r
Diffstat (limited to 'src/slic3r/GUI/3DScene.cpp')
-rw-r--r-- | src/slic3r/GUI/3DScene.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp index 7e312cb23..59480de1c 100644 --- a/src/slic3r/GUI/3DScene.cpp +++ b/src/slic3r/GUI/3DScene.cpp @@ -716,12 +716,12 @@ int GLVolumeCollection::load_wipe_tower_preview( brim_mesh.translate(-brim_width, -brim_width, 0.f); mesh.merge(brim_mesh); - mesh.rotate(rotation_angle, &origin_of_rotation); // rotates the box according to the config rotation setting - this->volumes.emplace_back(new GLVolume(color)); GLVolume &v = *this->volumes.back(); v.indexed_vertex_array.load_mesh(mesh, use_VBOs); v.set_volume_offset(Vec3d(pos_x, pos_y, 0.0)); + v.set_volume_rotation(Vec3d(0., 0., (M_PI/180.) * rotation_angle)); + // finalize_geometry() clears the vertex arrays, therefore the bounding box has to be computed before finalize_geometry(). v.bounding_box = v.indexed_vertex_array.bounding_box(); v.indexed_vertex_array.finalize_geometry(use_VBOs); |