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

Fix merge

Browse Source
This commit is contained in:
Filip Sykala 2022-03-09 12:59:20 +01:00
parent 5ffab4069a
commit c8e3836177
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libslic3r/Technologies.hpp
View File

@ -69,7 +69,7 @@
// Enable removal of old OpenGL render calls
#define ENABLE_GLBEGIN_GLEND_REMOVAL (1 && ENABLE_2_5_0_ALPHA1)
// Enable replace GLIndexedVertexArray with GLModel
#define ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL (1 && ENABLE_GLBEGIN_GLEND_REMOVAL)
#define ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL (0 && ENABLE_GLBEGIN_GLEND_REMOVAL)
// Enable show non-manifold edges
#define ENABLE_SHOW_NON_MANIFOLD_EDGES (1 && ENABLE_2_5_0_ALPHA1)
// Enable rework of Reload from disk command

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

@ -1599,9 +1599,8 @@ void GLGizmoEmboss::do_translate(const Vec3d &relative_move)
assert(m_volume->text_configuration.has_value());
Selection &selection = m_parent.get_selection();
assert(!selection.is_empty());
selection.start_dragging();
selection.setup_cache();
selection.translate(relative_move, ECoordinatesType::Local);
selection.stop_dragging();
std::string snapshot_name; // empty meand no store undo / redo
// NOTE: it use L instead of _L macro because prefix _ is appended inside
@ -1616,9 +1615,8 @@ void GLGizmoEmboss::do_rotate(float relative_z_angle)
assert(m_volume->text_configuration.has_value());
Selection &selection = m_parent.get_selection();
assert(!selection.is_empty());
selection.start_dragging();
selection.setup_cache();
selection.rotate(Vec3d(0., 0., relative_z_angle), TransformationType::Local);
selection.stop_dragging();
std::string snapshot_name; // empty meand no store undo / redo
// NOTE: it use L instead of _L macro because prefix _ is appended

5
src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
View File

@ -66,9 +66,8 @@ protected:
void on_set_state() override;
void on_set_hover_id() override{ m_rotate_gizmo.set_hover_id(m_hover_id); }
void on_enable_grabber(unsigned int id) override { m_rotate_gizmo.enable_grabber(0); }
void on_disable_grabber(unsigned int id) override { m_rotate_gizmo.disable_grabber(0); }
void on_update(const UpdateData &data) override { m_rotate_gizmo.update(data); }
void on_enable_grabber(unsigned int id) override { m_rotate_gizmo.enable_grabber(); }
void on_disable_grabber(unsigned int id) override { m_rotate_gizmo.disable_grabber(); }
void on_start_dragging() override;
void on_stop_dragging() override;

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

@ -68,6 +68,8 @@ public:
std::string get_tooltip() const override;
void set_group_id(int group_id) { m_group_id = group_id; }
void start_dragging();
void stop_dragging();