pengo1998/OrcaSlicer-bambulab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENABLE_SHADERS_MANAGER set as default

Browse Source
This commit is contained in:
enricoturri1966
2020-05-22 16:08:02 +02:00
parent 4d05ec0856
commit 314995fa0b
18 changed files with 57 additions and 1198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/3DBed.hpp
View File

@@ -3,9 +3,6 @@
#include "GLTexture.hpp"
#include "3DScene.hpp"
#if !ENABLE_SHADERS_MANAGER
#include "GLShader.hpp"
#endif // !ENABLE_SHADERS_MANAGER
#if ENABLE_GCODE_VIEWER
#include "GLModel.hpp"
#endif // ENABLE_GCODE_VIEWER
@@ -71,9 +68,6 @@ class Bed3D
Vec3d m_origin{ Vec3d::Zero() };
float m_stem_length{ DefaultStemLength };
mutable GL_Model m_arrow;
#if !ENABLE_SHADERS_MANAGER
mutable Shader m_shader;
#endif // !ENABLE_SHADERS_MANAGER
public:
#else
@@ -122,9 +116,6 @@ private:
mutable GLBed m_model;
// temporary texture shown until the main texture has still no levels compressed
mutable GLTexture m_temp_texture;
#if !ENABLE_SHADERS_MANAGER
mutable Shader m_shader;
#endif // !ENABLE_SHADERS_MANAGER
mutable unsigned int m_vbo_id;
Axes m_axes;