3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed a possible crash when closing the MMU painting gizmo cause by a non-virtual destructor.

Browse source
This commit is contained in:
Lukáš Hejl 2021-06-09 08:02:06 +02:00
parent 7377fc34ac
commit b2677f513c
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/Gizmos/GLGizmoMmuSegmentation.hpp
View file

@ -11,6 +11,7 @@ public:
: TriangleSelectorGUI(mesh), m_colors(colors) { : TriangleSelectorGUI(mesh), m_colors(colors) {
m_iva_colors = std::vector<GLIndexedVertexArray>(colors.size()); m_iva_colors = std::vector<GLIndexedVertexArray>(colors.size());
} }
~TriangleSelectorMmuGui() override = default;
// Render current selection. Transformation matrices are supposed // Render current selection. Transformation matrices are supposed
// to be already set. // to be already set.
@ -26,6 +27,7 @@ class GLGizmoMmuSegmentation : public GLGizmoPainterBase
public: public:
GLGizmoMmuSegmentation(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id) GLGizmoMmuSegmentation(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id)
: GLGizmoPainterBase(parent, icon_filename, sprite_id) {} : GLGizmoPainterBase(parent, icon_filename, sprite_id) {}
~GLGizmoMmuSegmentation() override = default;
void render_painter_gizmo() const override; void render_painter_gizmo() const override;

3
src/slic3r/GUI/Gizmos/GLGizmoPainterBase.hpp
View file

@ -31,6 +31,7 @@ class TriangleSelectorGUI : public TriangleSelector {
public: public:
explicit TriangleSelectorGUI(const TriangleMesh& mesh) explicit TriangleSelectorGUI(const TriangleMesh& mesh)
: TriangleSelector(mesh) {} : TriangleSelector(mesh) {}
virtual ~TriangleSelectorGUI() = default;
// Render current selection. Transformation matrices are supposed // Render current selection. Transformation matrices are supposed
// to be already set. // to be already set.
@ -64,7 +65,7 @@ private:
public: public:
GLGizmoPainterBase(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id); GLGizmoPainterBase(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id);
~GLGizmoPainterBase() override {} ~GLGizmoPainterBase() override = default;
virtual void set_painter_gizmo_data(const Selection& selection); virtual void set_painter_gizmo_data(const Selection& selection);
virtual bool gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_position, bool shift_down, bool alt_down, bool control_down); virtual bool gizmo_event(SLAGizmoEventType action, const Vec2d& mouse_position, bool shift_down, bool alt_down, bool control_down);