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

Merge branch 'master' into fs_dir_per_glyph_SPE-1597

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2023-08-10 14:01:03 +02:00
commit d8c7513668
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3593,11 +3593,6 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
update_sequential_clearance(true); update_sequential_clearance(true);
} }
} }
else if (evt.LeftUp() &&
m_gizmos.get_current_type() == GLGizmosManager::EType::Scale &&
m_gizmos.get_current()->get_state() == GLGizmoBase::EState::On) {
wxGetApp().obj_list()->selection_changed();
}
return; return;
} }

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

@ -835,6 +835,8 @@ void GLGizmoCut3D::on_load(cereal::BinaryInputArchive& ar)
ar( m_keep_upper, m_keep_lower, m_rotate_lower, m_rotate_upper, m_hide_cut_plane, m_mode, m_connectors_editing, ar( m_keep_upper, m_keep_lower, m_rotate_lower, m_rotate_upper, m_hide_cut_plane, m_mode, m_connectors_editing,
m_ar_plane_center, m_rotation_m); m_ar_plane_center, m_rotation_m);
m_start_dragging_m = m_rotation_m;
m_transformed_bounding_box = transformed_bounding_box(m_ar_plane_center, m_rotation_m); m_transformed_bounding_box = transformed_bounding_box(m_ar_plane_center, m_rotation_m);
set_center_pos(m_ar_plane_center); set_center_pos(m_ar_plane_center);

6
src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
View File

@ -99,6 +99,12 @@ void GLGizmoScale3D::enable_ununiversal_scale(bool enable)
m_grabbers[i].enabled = enable; m_grabbers[i].enabled = enable;
} }
void GLGizmoScale3D::on_set_state()
{
if (m_state == On)
wxGetApp().obj_list()->selection_changed();
}
void GLGizmoScale3D::data_changed(bool is_serializing) { void GLGizmoScale3D::data_changed(bool is_serializing) {
set_scale(Vec3d::Ones()); set_scale(Vec3d::Ones());
} }

2
src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
View File

@ -74,6 +74,8 @@ protected:
virtual void on_register_raycasters_for_picking() override; virtual void on_register_raycasters_for_picking() override;
virtual void on_unregister_raycasters_for_picking() override; virtual void on_unregister_raycasters_for_picking() override;
void on_set_state() override;
private: private:
void render_grabbers_connection(unsigned int id_1, unsigned int id_2, const ColorRGBA& color); void render_grabbers_connection(unsigned int id_1, unsigned int id_2, const ColorRGBA& color);