diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2020-03-02 13:35:03 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2020-03-02 13:35:03 +0300 |
| commit | 2f8970de860cfc09c3ddbffc02e4be34923e18bd (patch) | |
| tree | 496e002d4cddeba500bce7b62580f7e484ba352d /src/slic3r/GUI/GLCanvas3DManager.hpp | |
| parent | 0b629eb905cbd8e95d2edc86ae797880e01b315d (diff) | |
| parent | 11bd62a3e6887741701eb908e0fd0cc0b6afb576 (diff) | |
Fixed conflicts after merge with master
Diffstat (limited to 'src/slic3r/GUI/GLCanvas3DManager.hpp')
| -rw-r--r-- | src/slic3r/GUI/GLCanvas3DManager.hpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/slic3r/GUI/GLCanvas3DManager.hpp b/src/slic3r/GUI/GLCanvas3DManager.hpp index 9b983dbb1..2efa646d9 100644 --- a/src/slic3r/GUI/GLCanvas3DManager.hpp +++ b/src/slic3r/GUI/GLCanvas3DManager.hpp @@ -94,6 +94,17 @@ public: void detect() const; }; +#if ENABLE_HACK_CLOSING_ON_OSX_10_9_5 +#ifdef __APPLE__ + struct OSInfo + { + int major{ 0 }; + int minor{ 0 }; + int micro{ 0 }; + }; +#endif //__APPLE__ +#endif // ENABLE_HACK_CLOSING_ON_OSX_10_9_5 + private: #if ENABLE_NON_STATIC_CANVAS_MANAGER enum class EMultisampleState : unsigned char @@ -118,6 +129,15 @@ private: wxGLContext* m_context{ nullptr }; #else wxGLContext* m_context; +<<<<<<< HEAD +======= + static GLInfo s_gl_info; +#if ENABLE_HACK_CLOSING_ON_OSX_10_9_5 +#ifdef __APPLE__ + static OSInfo s_os_info; +#endif //__APPLE__ +#endif // ENABLE_HACK_CLOSING_ON_OSX_10_9_5 +>>>>>>> 11bd62a3e6887741701eb908e0fd0cc0b6afb576 bool m_gl_initialized; CanvasesMap m_canvases; #endif // ENABLE_NON_STATIC_CANVAS_MANAGER |