diff options
| author | enricoturri1966 <enricoturri@seznam.cz> | 2022-05-18 13:40:38 +0300 |
|---|---|---|
| committer | enricoturri1966 <enricoturri@seznam.cz> | 2022-06-06 13:22:42 +0300 |
| commit | 3b3edb5a9743c9597ecb894fe74bb5bd9c2852f0 (patch) | |
| tree | 037ca471fc49da64edff9aa77dffbc7b307d95e4 | |
| parent | e3d648c8025edfd0465ae543c58a21846f04e685 (diff) | |
Fixed build and warnings on Linux and Mac
Fixed conflicts during rebase with master
| -rw-r--r-- | src/slic3r/GUI/GLCanvas3D.cpp | 1 | ||||
| -rw-r--r-- | src/slic3r/GUI/GUI_ObjectManipulation.cpp | 2 | ||||
| -rw-r--r-- | src/slic3r/GUI/Selection.cpp | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 45ef3c002..959611bea 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -4146,7 +4146,6 @@ void GLCanvas3D::do_reset_skew(const std::string& snapshot_type) std::set<std::pair<int, int>> done; // keeps track of modified instances
- Selection::EMode selection_mode = m_selection.get_mode();
const Selection::IndicesList& idxs = m_selection.get_volume_idxs();
for (unsigned int id : idxs) {
diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp index 6fbc55511..74cb64e9f 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp @@ -1413,7 +1413,9 @@ void ObjectManipulation::on_change(const std::string& opt_key, int axis, double void ObjectManipulation::set_uniform_scaling(const bool use_uniform_scale) { +#if !ENABLE_TRANSFORMATIONS_BY_MATRICES const Selection &selection = wxGetApp().plater()->canvas3D()->get_selection(); +#endif // !ENABLE_TRANSFORMATIONS_BY_MATRICES #if ENABLE_WORLD_COORDINATE if (!use_uniform_scale) { #if !ENABLE_TRANSFORMATIONS_BY_MATRICES diff --git a/src/slic3r/GUI/Selection.cpp b/src/slic3r/GUI/Selection.cpp index 60bc8346e..4a60cbe63 100644 --- a/src/slic3r/GUI/Selection.cpp +++ b/src/slic3r/GUI/Selection.cpp @@ -785,7 +785,7 @@ void Selection::translate(const Vec3d& displacement, TransformationType transfor }
else {
const Vec3d offset = transformation_type.local() ?
- volume_data.get_volume_transform().get_rotation_matrix() * displacement : displacement;
+ (Vec3d)(volume_data.get_volume_transform().get_rotation_matrix() * displacement) : displacement;
transform_volume_relative(v, volume_data, transformation_type, Geometry::translation_transform(offset));
}
}
|