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

Fix build on Linux and MAC

Browse source
This commit is contained in:
Enrico Turri 2020-03-02 13:09:12 +01:00
parent d11548cbf9
commit 9e06a5e8d6
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/GLCanvas3DManager.cpp
View file

@ -207,7 +207,7 @@ GLCanvas3DManager::GLInfo GLCanvas3DManager::s_gl_info;
bool GLCanvas3DManager::s_compressed_textures_supported = false; bool GLCanvas3DManager::s_compressed_textures_supported = false;
#if ENABLE_NON_STATIC_CANVAS_MANAGER #if ENABLE_NON_STATIC_CANVAS_MANAGER
GLCanvas3DManager::EMultisampleState GLCanvas3DManager::s_multisample = GLCanvas3DManager::EMultisampleState::Unknown; GLCanvas3DManager::EMultisampleState GLCanvas3DManager::s_multisample = GLCanvas3DManager::EMultisampleState::Unknown;
GLCanvas3DManager::EFramebufferType GLCanvas3DManager::s_framebuffers_type = GLCanvas3DManager::EFramebufferType::None; GLCanvas3DManager::EFramebufferType GLCanvas3DManager::s_framebuffers_type = GLCanvas3DManager::EFramebufferType::Unknown;
#else #else
GLCanvas3DManager::EMultisampleState GLCanvas3DManager::s_multisample = GLCanvas3DManager::MS_Unknown; GLCanvas3DManager::EMultisampleState GLCanvas3DManager::s_multisample = GLCanvas3DManager::MS_Unknown;
GLCanvas3DManager::EFramebufferType GLCanvas3DManager::s_framebuffers_type = GLCanvas3DManager::FB_None; GLCanvas3DManager::EFramebufferType GLCanvas3DManager::s_framebuffers_type = GLCanvas3DManager::FB_None;
@ -337,7 +337,7 @@ void GLCanvas3DManager::init_gl()
else if (GLEW_EXT_framebuffer_object) else if (GLEW_EXT_framebuffer_object)
s_framebuffers_type = EFramebufferType::Ext; s_framebuffers_type = EFramebufferType::Ext;
else else
s_framebuffers_type = EFramebufferType::None; s_framebuffers_type = EFramebufferType::Unknown;
#else #else
if (GLEW_ARB_framebuffer_object) if (GLEW_ARB_framebuffer_object)
s_framebuffers_type = FB_Arb; s_framebuffers_type = FB_Arb;

4
src/slic3r/GUI/GLCanvas3DManager.hpp
View file

@ -35,7 +35,7 @@ public:
#if ENABLE_NON_STATIC_CANVAS_MANAGER #if ENABLE_NON_STATIC_CANVAS_MANAGER
enum class EFramebufferType : unsigned char enum class EFramebufferType : unsigned char
{ {
None, Unknown,
Arb, Arb,
Ext Ext
}; };
@ -182,7 +182,7 @@ public:
static bool are_compressed_textures_supported() { return s_compressed_textures_supported; } static bool are_compressed_textures_supported() { return s_compressed_textures_supported; }
#if ENABLE_NON_STATIC_CANVAS_MANAGER #if ENABLE_NON_STATIC_CANVAS_MANAGER
static bool can_multisample() { return s_multisample == EMultisampleState::Enabled; } static bool can_multisample() { return s_multisample == EMultisampleState::Enabled; }
static bool are_framebuffers_supported() { return (s_framebuffers_type != EFramebufferType::None); } static bool are_framebuffers_supported() { return (s_framebuffers_type != EFramebufferType::Unknown); }
#else #else
static bool can_multisample() { return s_multisample == MS_Enabled; } static bool can_multisample() { return s_multisample == MS_Enabled; }
static bool are_framebuffers_supported() { return (s_framebuffers_type != FB_None); } static bool are_framebuffers_supported() { return (s_framebuffers_type != FB_None); }

2
src/slic3r/GUI/Plater.cpp
View file

@ -2047,7 +2047,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
#ifdef __APPLE__ #ifdef __APPLE__
// set default view_toolbar icons size equal to GLGizmosManager::Default_Icons_Size // set default view_toolbar icons size equal to GLGizmosManager::Default_Icons_Size
m_view_toolbar.set_icons_size(GLGizmosManager::Default_Icons_Size); view_toolbar.set_icons_size(GLGizmosManager::Default_Icons_Size);
#endif // __APPLE__ #endif // __APPLE__
#else #else
view3D = new View3D(q, bed, camera, view_toolbar, &model, config, &background_process); view3D = new View3D(q, bed, camera, view_toolbar, &model, config, &background_process);