Fixed conflicts after merge with master

2022-10-31 14:59:41 +01:00 · 2022-10-31 14:59:41 +01:00 · 2c9d047520
commit 2c9d047520
parent 377ff4a519 7742ebb813
67 changed files with 13605 additions and 9748 deletions
--- a/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.hpp
@ -200,6 +200,7 @@ public:

    EType get_current_type() const { return m_current; }
    GLGizmoBase* get_current() const;
+    GLGizmoBase* get_gizmo(GLGizmosManager::EType type) const;
    EType get_gizmo_from_name(const std::string& gizmo_name) const;

    bool is_running() const;