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

Removed obsolete GLCanvas3D::m_shader_enabled

Browse Source
This commit is contained in:
Enrico Turri 2018-12-20 13:20:21 +01:00
parent 3fbc4afc95
commit 68684dd003
4 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -3830,7 +3830,6 @@ GLCanvas3D::GLCanvas3D(wxGLCanvas* canvas)
, m_legend_texture_enabled(false) , m_legend_texture_enabled(false)
, m_picking_enabled(false) , m_picking_enabled(false)
, m_moving_enabled(false) , m_moving_enabled(false)
, m_shader_enabled(false)
, m_dynamic_background_enabled(false) , m_dynamic_background_enabled(false)
, m_multisample_allowed(false) , m_multisample_allowed(false)
, m_regenerate_volumes(true) , m_regenerate_volumes(true)
@ -4144,11 +4143,6 @@ void GLCanvas3D::enable_toolbar(bool enable)
m_toolbar.set_enabled(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) void GLCanvas3D::enable_force_zoom_to_bed(bool enable)
{ {
m_force_zoom_to_bed_enabled = enable; m_force_zoom_to_bed_enabled = enable;
@ -6322,9 +6316,7 @@ void GLCanvas3D::_render_objects() const
::glEnable(GL_LIGHTING); ::glEnable(GL_LIGHTING);
::glEnable(GL_DEPTH_TEST); ::glEnable(GL_DEPTH_TEST);
if (!m_shader_enabled) if (m_use_VBOs)
_render_volumes(false);
else if (m_use_VBOs)
{ {
if (m_picking_enabled) if (m_picking_enabled)
{ {

2
src/slic3r/GUI/GLCanvas3D.hpp
View File

@ -850,7 +850,6 @@ private:
bool m_legend_texture_enabled; bool m_legend_texture_enabled;
bool m_picking_enabled; bool m_picking_enabled;
bool m_moving_enabled; bool m_moving_enabled;
bool m_shader_enabled;
bool m_dynamic_background_enabled; bool m_dynamic_background_enabled;
bool m_multisample_allowed; bool m_multisample_allowed;
bool m_regenerate_volumes; bool m_regenerate_volumes;
@ -950,7 +949,6 @@ public:
void enable_moving(bool enable); void enable_moving(bool enable);
void enable_gizmos(bool enable); void enable_gizmos(bool enable);
void enable_toolbar(bool enable); void enable_toolbar(bool enable);
void enable_shader(bool enable);
void enable_force_zoom_to_bed(bool enable); void enable_force_zoom_to_bed(bool enable);
void enable_dynamic_background(bool enable); void enable_dynamic_background(bool enable);
void allow_multisample(bool allow); void allow_multisample(bool allow);

2
src/slic3r/GUI/GUI_Preview.cpp
View File

@ -70,7 +70,6 @@ bool View3D::init(wxWindow* parent, Model* model, DynamicPrintConfig* config, Ba
m_canvas->set_config(config); m_canvas->set_config(config);
m_canvas->enable_gizmos(true); m_canvas->enable_gizmos(true);
m_canvas->enable_toolbar(true); m_canvas->enable_toolbar(true);
m_canvas->enable_shader(true);
m_canvas->enable_force_zoom_to_bed(true); m_canvas->enable_force_zoom_to_bed(true);
#if !ENABLE_IMGUI #if !ENABLE_IMGUI
@ -257,7 +256,6 @@ bool Preview::init(wxNotebook* notebook, DynamicPrintConfig* config, BackgroundS
_3DScene::add_canvas(m_canvas_widget); _3DScene::add_canvas(m_canvas_widget);
m_canvas = _3DScene::get_canvas(this->m_canvas_widget); m_canvas = _3DScene::get_canvas(this->m_canvas_widget);
m_canvas->allow_multisample(GLCanvas3DManager::can_multisample()); m_canvas->allow_multisample(GLCanvas3DManager::can_multisample());
m_canvas->enable_shader(true);
m_canvas->set_config(m_config); m_canvas->set_config(m_config);
m_canvas->set_process(process); m_canvas->set_process(process);
m_canvas->enable_legend_texture(true); m_canvas->enable_legend_texture(true);

1
src/slic3r/GUI/Plater.cpp
View File

@ -1132,7 +1132,6 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
this->canvas3D->set_config(config); this->canvas3D->set_config(config);
this->canvas3D->enable_gizmos(true); this->canvas3D->enable_gizmos(true);
this->canvas3D->enable_toolbar(true); this->canvas3D->enable_toolbar(true);
this->canvas3D->enable_shader(true);
this->canvas3D->enable_force_zoom_to_bed(true); this->canvas3D->enable_force_zoom_to_bed(true);
#endif // ENABLE_REMOVE_TABS_FROM_PLATER #endif // ENABLE_REMOVE_TABS_FROM_PLATER