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

Fixed warnings

Browse Source
This commit is contained in:
enricoturri1966 2022-01-14 14:14:16 +01:00
parent 8057a70b11
commit 0d36d3a016
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

@ -124,8 +124,6 @@ void GLGizmoMove3D::on_render()
if (!m_cone.is_initialized()) if (!m_cone.is_initialized())
m_cone.init_from(its_make_cone(1.0, 1.0, double(PI) / 18.0)); m_cone.init_from(its_make_cone(1.0, 1.0, double(PI) / 18.0));
const Selection& selection = m_parent.get_selection();
glsafe(::glClear(GL_DEPTH_BUFFER_BIT)); glsafe(::glClear(GL_DEPTH_BUFFER_BIT));
glsafe(::glEnable(GL_DEPTH_TEST)); glsafe(::glEnable(GL_DEPTH_TEST));

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

@ -611,7 +611,7 @@ bool Selection::requires_uniform_scale() const
if (!Geometry::is_rotation_ninety_degrees(Geometry::Transformation(get_volume(*m_list.begin())->world_matrix()).get_rotation())) { if (!Geometry::is_rotation_ninety_degrees(Geometry::Transformation(get_volume(*m_list.begin())->world_matrix()).get_rotation())) {
if (reason != nullptr) if (reason != nullptr)
*reason = EUniformScaleRequiredReason::VolumeNotAxisAligned_World; *reason = EUniformScaleRequiredReason::VolumeNotAxisAligned_World;
return true; return true;
} }
} }
else if (coord_type == ECoordinatesType::Instance) { else if (coord_type == ECoordinatesType::Instance) {
@ -626,7 +626,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())) {
@ -655,12 +655,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;