diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-03 20:28:46 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-03 20:31:32 +0300 |
commit | aa175e003386fa68f7aa24a1c947e5b6ad999f6a (patch) | |
tree | 788b4e356d10490527d222d1c521a2bdd0876803 /intern | |
parent | b5372e3e3704bdf5d30faeb6aba8a92230592e65 (diff) |
Fix for T58250 fix: Blender failing to start with OpenGL context < 4.5.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/ghost/intern/GHOST_ContextGLX.cpp | 12 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowX11.cpp | 6 |
2 files changed, 8 insertions, 10 deletions
diff --git a/intern/ghost/intern/GHOST_ContextGLX.cpp b/intern/ghost/intern/GHOST_ContextGLX.cpp index 8f418e4ab23..4517d2f0fec 100644 --- a/intern/ghost/intern/GHOST_ContextGLX.cpp +++ b/intern/ghost/intern/GHOST_ContextGLX.cpp @@ -330,23 +330,15 @@ const bool GLXEW_ARB_create_context_robustness = if (!version || version[0] < '3' || ((version[0] == '3') && (version[2] < '3'))) { success = GHOST_kFailure; } - else + else { success = GHOST_kSuccess; + } } else { /* freeing well clean up the context initialized above */ success = GHOST_kFailure; } - if (success == GHOST_kFailure) { - fprintf(stderr, "Error! Unsupported graphics driver.\n"); - fprintf(stderr, "Blender requires a graphics driver with at least OpenGL 3.3 support.\n"); - fprintf(stderr, "The program will now close.\n"); - fflush(stderr); - /* ugly, but we get crashes unless a whole bunch of systems are patched. */ - exit(1); - } - GHOST_X11_ERROR_HANDLERS_RESTORE(handler_store); return success; diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 3751f7f78ea..fb3326ea4f4 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -1376,6 +1376,12 @@ GHOST_Context *GHOST_WindowX11::newDrawingContext(GHOST_TDrawingContextType type else delete context; + /* Ugly, but we get crashes unless a whole bunch of systems are patched. */ + fprintf(stderr, "Error! Unsupported graphics driver.\n"); + fprintf(stderr, "Blender requires a graphics driver with at least OpenGL 3.3 support.\n"); + fprintf(stderr, "The program will now close.\n"); + fflush(stderr); + exit(1); } return NULL; |