From fc4b18ebb1b27606114d5444764829c796aef666 Mon Sep 17 00:00:00 2001
From: Filip Sykala <filip.sykala@prusa3d.cz>
Date: Mon, 2 Aug 2021 10:46:47 +0200
Subject: [PATCH] Merge master

---
 src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp | 4 ++--
 src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
index 22b311527..92654c606 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
@@ -41,8 +41,8 @@ std::string GLGizmoSimplify::on_get_name() const
     return (_L("Simplify")).ToUTF8().data();
 }
 
-void GLGizmoSimplify::on_render() const{}
-void GLGizmoSimplify::on_render_for_picking() const{}
+void GLGizmoSimplify::on_render() {}
+void GLGizmoSimplify::on_render_for_picking() {}
 
 void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limit)
 {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
index 06461d222..49c3e8dbd 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp
@@ -36,8 +36,8 @@ public:
 protected:
     virtual bool on_init() override;
     virtual std::string on_get_name() const override;
-    virtual void on_render() const override;
-    virtual void on_render_for_picking() const override;    
+    virtual void on_render() override;
+    virtual void on_render_for_picking() override;    
     virtual void on_render_input_window(float x, float y, float bottom_limit) override;
     virtual bool on_is_activable() const override;
     virtual bool on_is_selectable() const override { return false; };