Commit: 46218dc9f9dde0685c3580d3f3ebb37fa0db36e9
Author: Ines Almeida
Date:   Sun Dec 13 10:35:16 2015 +0000
Branches: master
https://developer.blender.org/rB46218dc9f9dde0685c3580d3f3ebb37fa0db36e9

Fix: unreported crash with misconfigured nvidia opengl drivers

===================================================================

M       intern/ghost/intern/GHOST_ContextGLX.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_ContextGLX.cpp 
b/intern/ghost/intern/GHOST_ContextGLX.cpp
index 8e46c95..90d810b 100644
--- a/intern/ghost/intern/GHOST_ContextGLX.cpp
+++ b/intern/ghost/intern/GHOST_ContextGLX.cpp
@@ -329,8 +329,8 @@ const bool GLXEW_ARB_create_context_robustness =
 
                version = glGetString(GL_VERSION);
 
-               if (version[0] < '2' || ((version[0] == '2') &&  (version[2] < 
'1'))) {
-                       fprintf(stderr, "Error! Blender requires OpenGL 2.1 to 
run.\n");
+               if (!version || version[0] < '2' || ((version[0] == '2') &&  
(version[2] < '1'))) {
+                       fprintf(stderr, "Error! Blender requires OpenGL 2.1 to 
run. Try updating your drivers.\n");
                        fflush(stderr);
                        /* ugly, but we get crashes unless a whole bunch of 
systems are patched. */
                        exit(0);
@@ -516,4 +516,4 @@ static GLboolean _glewSearchExtension(const char *name, 
const GLubyte *start, co
        }
        return GL_FALSE;
 }
-#endif  /* USE_GLXEW_INIT_WORKAROUND */
\ No newline at end of file
+#endif  /* USE_GLXEW_INIT_WORKAROUND */

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to