From 68812b081ffc993845c10e7c8697a053dc45df91 Mon Sep 17 00:00:00 2001 From: Enrico Turri <enricoturri@seznam.cz> Date: Mon, 9 Dec 2019 15:40:14 +0100 Subject: [PATCH] Removed obsolete (and unused) code --- src/slic3r/GUI/GLCanvas3D.cpp | 3 +-- src/slic3r/GUI/GLCanvas3D.hpp | 4 ---- src/slic3r/GUI/Plater.cpp | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index dcf45e91d..51c922915 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -1378,7 +1378,6 @@ GLCanvas3D::GLCanvas3D(wxGLCanvas* canvas, Bed3D& bed, Camera& camera, GLToolbar , m_retina_helper(nullptr) #endif , m_in_render(false) - , m_render_enabled(true) , m_bed(bed) , m_camera(camera) , m_view_toolbar(view_toolbar) @@ -1791,7 +1790,7 @@ void GLCanvas3D::update_volumes_colors_by_extruder() void GLCanvas3D::render() { - if (!m_render_enabled || m_in_render) + if (m_in_render) { // if called recursively, return m_dirty = true; diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp index 3b23a74a5..b56a3f1aa 100644 --- a/src/slic3r/GUI/GLCanvas3D.hpp +++ b/src/slic3r/GUI/GLCanvas3D.hpp @@ -417,7 +417,6 @@ private: std::unique_ptr<RetinaHelper> m_retina_helper; #endif bool m_in_render; - bool m_render_enabled; LegendTexture m_legend_texture; WarningTexture m_warning_texture; wxTimer m_timer; @@ -555,9 +554,6 @@ public: void enable_dynamic_background(bool enable); void allow_multisample(bool allow); - void enable_render(bool enable) { m_render_enabled = enable; } - bool is_render_enabled() const { return m_render_enabled; } - void zoom_to_bed(); void zoom_to_volumes(); void zoom_to_selection(); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 7014b96a6..b2d00e0d5 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -3221,7 +3221,6 @@ void Plater::priv::reload_from_disk() catch (std::exception&) { // error while loading - view3D->get_canvas3d()->enable_render(true); return; }