From 68684dd0037a76d1f74e7368159bfc2a43ae6d9d Mon Sep 17 00:00:00 2001
From: Enrico Turri <enricoturri@seznam.cz>
Date: Thu, 20 Dec 2018 13:20:21 +0100
Subject: [PATCH] Removed obsolete GLCanvas3D::m_shader_enabled

---
 src/slic3r/GUI/GLCanvas3D.cpp  | 10 +---------
 src/slic3r/GUI/GLCanvas3D.hpp  |  2 --
 src/slic3r/GUI/GUI_Preview.cpp |  2 --
 src/slic3r/GUI/Plater.cpp      |  1 -
 4 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 77d0f0776..66d4622fe 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -3830,7 +3830,6 @@ GLCanvas3D::GLCanvas3D(wxGLCanvas* canvas)
     , m_legend_texture_enabled(false)
     , m_picking_enabled(false)
     , m_moving_enabled(false)
-    , m_shader_enabled(false)
     , m_dynamic_background_enabled(false)
     , m_multisample_allowed(false)
     , m_regenerate_volumes(true)
@@ -4144,11 +4143,6 @@ void GLCanvas3D::enable_toolbar(bool enable)
     m_toolbar.set_enabled(enable);
 }
 
-void GLCanvas3D::enable_shader(bool enable)
-{
-    m_shader_enabled = enable;
-}
-
 void GLCanvas3D::enable_force_zoom_to_bed(bool enable)
 {
     m_force_zoom_to_bed_enabled = enable;
@@ -6322,9 +6316,7 @@ void GLCanvas3D::_render_objects() const
     ::glEnable(GL_LIGHTING);
     ::glEnable(GL_DEPTH_TEST);
 
-    if (!m_shader_enabled)
-        _render_volumes(false);
-    else if (m_use_VBOs)
+    if (m_use_VBOs)
     {
         if (m_picking_enabled)
         {
diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp
index 8e9d44a4b..0cd6cb9b9 100644
--- a/src/slic3r/GUI/GLCanvas3D.hpp
+++ b/src/slic3r/GUI/GLCanvas3D.hpp
@@ -850,7 +850,6 @@ private:
     bool m_legend_texture_enabled;
     bool m_picking_enabled;
     bool m_moving_enabled;
-    bool m_shader_enabled;
     bool m_dynamic_background_enabled;
     bool m_multisample_allowed;
     bool m_regenerate_volumes;
@@ -950,7 +949,6 @@ public:
     void enable_moving(bool enable);
     void enable_gizmos(bool enable);
     void enable_toolbar(bool enable);
-    void enable_shader(bool enable);
     void enable_force_zoom_to_bed(bool enable);
     void enable_dynamic_background(bool enable);
     void allow_multisample(bool allow);
diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp
index 988a7b6a1..459bd9e5b 100644
--- a/src/slic3r/GUI/GUI_Preview.cpp
+++ b/src/slic3r/GUI/GUI_Preview.cpp
@@ -70,7 +70,6 @@ bool View3D::init(wxWindow* parent, Model* model, DynamicPrintConfig* config, Ba
     m_canvas->set_config(config);
     m_canvas->enable_gizmos(true);
     m_canvas->enable_toolbar(true);
-    m_canvas->enable_shader(true);
     m_canvas->enable_force_zoom_to_bed(true);
 
 #if !ENABLE_IMGUI
@@ -257,7 +256,6 @@ bool Preview::init(wxNotebook* notebook, DynamicPrintConfig* config, BackgroundS
 	_3DScene::add_canvas(m_canvas_widget);
 	m_canvas = _3DScene::get_canvas(this->m_canvas_widget);
     m_canvas->allow_multisample(GLCanvas3DManager::can_multisample());
-    m_canvas->enable_shader(true);
     m_canvas->set_config(m_config);
     m_canvas->set_process(process);
     m_canvas->enable_legend_texture(true);
diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp
index 6a8bcc79b..db19180b4 100644
--- a/src/slic3r/GUI/Plater.cpp
+++ b/src/slic3r/GUI/Plater.cpp
@@ -1132,7 +1132,6 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
     this->canvas3D->set_config(config);
     this->canvas3D->enable_gizmos(true);
     this->canvas3D->enable_toolbar(true);
-    this->canvas3D->enable_shader(true);
     this->canvas3D->enable_force_zoom_to_bed(true);
 #endif // ENABLE_REMOVE_TABS_FROM_PLATER