[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56912] trunk/blender/intern/ghost/intern: revert (ifdef) r54745.

[Campbell Barton]

Revision: 56912
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56912
Author:   campbellbarton
Date:     2013-05-19 11:39:22 +0000 (Sun, 19 May 2013)
Log Message:
-----------
revert (ifdef) r54745. which enbabled alpha in the GL buffer.
looks to be the cause of bug [#35415]

we can make this optional.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54745

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
    trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp	2013-05-19 09:45:53 UTC (rev 56911)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp	2013-05-19 11:39:22 UTC (rev 56912)
@@ -692,7 +692,9 @@
 		WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB,
 		WGL_COLOR_BITS_ARB, pfd.cColorBits,
 		WGL_DEPTH_BITS_ARB, pfd.cDepthBits,
+#ifdef GHOST_OPENGL_ALPHA
 		WGL_ALPHA_BITS_ARB, pfd.cAlphaBits,
+#endif
 		WGL_STENCIL_BITS_ARB, pfd.cStencilBits,
 		WGL_DOUBLE_BUFFER_ARB, GL_TRUE,
 		WGL_SAMPLE_BUFFERS_ARB, GL_TRUE,
@@ -1302,8 +1304,10 @@
 
 	weight += pfd.cColorBits - 8;
 
+#ifdef GHOST_OPENGL_ALPHA
 	if (pfd.cAlphaBits > 0)
 		weight ++;
+#endif
 
 	/* want swap copy capability -- it matters a lot */
 	if (pfd.dwFlags & PFD_SWAP_COPY) weight += 16;

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2013-05-19 09:45:53 UTC (rev 56911)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2013-05-19 11:39:22 UTC (rev 56912)
@@ -211,7 +211,9 @@
 		attributes[i++] = GLX_BLUE_SIZE;  attributes[i++] = 1;
 		attributes[i++] = GLX_GREEN_SIZE; attributes[i++] = 1;
 		attributes[i++] = GLX_DEPTH_SIZE; attributes[i++] = 1;
+#ifdef GHOST_OPENGL_ALPHA
 		attributes[i++] = GLX_ALPHA_SIZE; attributes[i++] = 1;
+#endif
 		/* GLX >= 1.4 required for multi-sample */
 		if (samples && (glxVersionMajor >= 1) && (glxVersionMinor >= 4)) {
 			attributes[i++] = GLX_SAMPLE_BUFFERS; attributes[i++] = 1;