GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-16 08:55:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed warnings

Browse Source 
Fixed conflicts during rebase with master
This commit is contained in:
enricoturri1966 2022-01-14 14:14:16 +01:00
parent 6e92b4fc3b
commit cd4704e493
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
View File

@ -153,8 +153,6 @@ void GLGizmoMove3D::on_render()
glsafe(::glClear(GL_DEPTH_BUFFER_BIT)); glsafe(::glClear(GL_DEPTH_BUFFER_BIT));
glsafe(::glEnable(GL_DEPTH_TEST)); glsafe(::glEnable(GL_DEPTH_TEST));
const Selection& selection = m_parent.get_selection();
#if ENABLE_WORLD_COORDINATE #if ENABLE_WORLD_COORDINATE
glsafe(::glPushMatrix()); glsafe(::glPushMatrix());
calc_selection_box_and_center(); calc_selection_box_and_center();

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

@ -623,7 +623,7 @@ bool Selection::requires_uniform_scale() const
#else #else
return !Geometry::is_rotation_ninety_degrees(Geometry::Transformation(get_volume(*m_list.begin())->world_matrix()).get_rotation()); return !Geometry::is_rotation_ninety_degrees(Geometry::Transformation(get_volume(*m_list.begin())->world_matrix()).get_rotation());
#endif // ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES #endif // ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES
else if (is_single_full_instance()) else if (is_single_full_instance()) {
#if ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES #if ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES
if (coord_type == ECoordinatesType::World) { if (coord_type == ECoordinatesType::World) {
if (!Geometry::is_rotation_ninety_degrees(get_volume(*m_list.begin())->get_instance_rotation())) { if (!Geometry::is_rotation_ninety_degrees(get_volume(*m_list.begin())->get_instance_rotation())) {
@ -652,12 +652,14 @@ bool Selection::requires_uniform_scale() const
} }
return false; return false;
} }
}
if (reason != nullptr) if (reason != nullptr)
*reason = EUniformScaleRequiredReason::MultipleSelection; *reason = EUniformScaleRequiredReason::MultipleSelection;
#else #else
return wxGetApp().obj_manipul()->get_world_coordinates() ? return wxGetApp().obj_manipul()->get_world_coordinates() ?
!Geometry::is_rotation_ninety_degrees(get_volume(*m_list.begin())->get_instance_rotation()) : false; !Geometry::is_rotation_ninety_degrees(get_volume(*m_list.begin())->get_instance_rotation()) : false;
}
#endif // ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES #endif // ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES
return true; return true;