From 9e06a5e8d665ffef575285764e81a4493df86f52 Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Mon, 2 Mar 2020 13:09:12 +0100 Subject: [PATCH] Fix build on Linux and MAC --- src/slic3r/GUI/GLCanvas3DManager.cpp | 4 ++-- src/slic3r/GUI/GLCanvas3DManager.hpp | 4 ++-- src/slic3r/GUI/Plater.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/slic3r/GUI/GLCanvas3DManager.cpp b/src/slic3r/GUI/GLCanvas3DManager.cpp index a4b45dd66..f27525427 100644 --- a/src/slic3r/GUI/GLCanvas3DManager.cpp +++ b/src/slic3r/GUI/GLCanvas3DManager.cpp @@ -207,7 +207,7 @@ GLCanvas3DManager::GLInfo GLCanvas3DManager::s_gl_info; bool GLCanvas3DManager::s_compressed_textures_supported = false; #if ENABLE_NON_STATIC_CANVAS_MANAGER 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 GLCanvas3DManager::EMultisampleState GLCanvas3DManager::s_multisample = GLCanvas3DManager::MS_Unknown; GLCanvas3DManager::EFramebufferType GLCanvas3DManager::s_framebuffers_type = GLCanvas3DManager::FB_None; @@ -337,7 +337,7 @@ void GLCanvas3DManager::init_gl() else if (GLEW_EXT_framebuffer_object) s_framebuffers_type = EFramebufferType::Ext; else - s_framebuffers_type = EFramebufferType::None; + s_framebuffers_type = EFramebufferType::Unknown; #else if (GLEW_ARB_framebuffer_object) s_framebuffers_type = FB_Arb; diff --git a/src/slic3r/GUI/GLCanvas3DManager.hpp b/src/slic3r/GUI/GLCanvas3DManager.hpp index ad27f1339..5f0c76cb7 100644 --- a/src/slic3r/GUI/GLCanvas3DManager.hpp +++ b/src/slic3r/GUI/GLCanvas3DManager.hpp @@ -35,7 +35,7 @@ public: #if ENABLE_NON_STATIC_CANVAS_MANAGER enum class EFramebufferType : unsigned char { - None, + Unknown, Arb, Ext }; @@ -182,7 +182,7 @@ public: static bool are_compressed_textures_supported() { return s_compressed_textures_supported; } #if ENABLE_NON_STATIC_CANVAS_MANAGER 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 static bool can_multisample() { return s_multisample == MS_Enabled; } static bool are_framebuffers_supported() { return (s_framebuffers_type != FB_None); } diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 38ca03656..b5a43b7d0 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -2047,7 +2047,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame) #ifdef __APPLE__ // 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__ #else view3D = new View3D(q, bed, camera, view_toolbar, &model, config, &background_process);