[Bf-blender-cvs] [3cdfea1] soc-2014-viewport_context: Minor fix in GLX logic
Antony Riakiotakis
noreply at git.blender.org
Mon Sep 1 17:12:24 CEST 2014
Commit: 3cdfea119d93ea3d1ec5096cb7d218c7ae4991d5
Author: Antony Riakiotakis
Date: Mon Sep 1 17:12:03 2014 +0200
Branches: soc-2014-viewport_context
https://developer.blender.org/rB3cdfea119d93ea3d1ec5096cb7d218c7ae4991d5
Minor fix in GLX logic
===================================================================
M intern/ghost/intern/GHOST_ContextGLX.cpp
===================================================================
diff --git a/intern/ghost/intern/GHOST_ContextGLX.cpp b/intern/ghost/intern/GHOST_ContextGLX.cpp
index 6827e5c..726614c 100644
--- a/intern/ghost/intern/GHOST_ContextGLX.cpp
+++ b/intern/ghost/intern/GHOST_ContextGLX.cpp
@@ -215,7 +215,7 @@ GHOST_TSuccess GHOST_ContextGLX::initializeDrawingContext()
}
/* GLX >= 1.4 required for multi-sample */
- if (actualSamples > 0 && (glx_major >= 1) && (glx_minor >= 4)) {
+ if (actualSamples > 0 && ((glx_major > 1) || (glx_major == 1 && glx_minor >= 4))) {
attribs.push_back(GLX_SAMPLE_BUFFERS);
attribs.push_back(1);
More information about the Bf-blender-cvs
mailing list