3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed build and warnings on Linux and Mac

Browse Source 
Fixed conflicts during rebase with master
This commit is contained in:
enricoturri1966 2022-05-18 12:40:38 +02:00
parent e3d648c802
commit 3b3edb5a97
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -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 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(); const Selection::IndicesList& idxs = m_selection.get_volume_idxs();
for (unsigned int id : idxs) { for (unsigned int id : idxs) {

2
src/slic3r/GUI/GUI_ObjectManipulation.cpp
View File

@ -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) void ObjectManipulation::set_uniform_scaling(const bool use_uniform_scale)
{ {
#if !ENABLE_TRANSFORMATIONS_BY_MATRICES
const Selection &selection = wxGetApp().plater()->canvas3D()->get_selection(); const Selection &selection = wxGetApp().plater()->canvas3D()->get_selection();
#endif // !ENABLE_TRANSFORMATIONS_BY_MATRICES
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
if (!use_uniform_scale) { if (!use_uniform_scale) {
#if !ENABLE_TRANSFORMATIONS_BY_MATRICES #if !ENABLE_TRANSFORMATIONS_BY_MATRICES

2
src/slic3r/GUI/Selection.cpp
View File

@ -785,7 +785,7 @@ void Selection::translate(const Vec3d& displacement, TransformationType transfor
} }
else { else {
const Vec3d offset = transformation_type.local() ? 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)); transform_volume_relative(v, volume_data, transformation_type, Geometry::translation_transform(offset));
} }
} }