diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-03-06 20:38:26 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-03-06 20:38:26 +0400 |
| commit | 1cec30f454a74785e9fbba101354016a8e8b62f7 (patch) | |
| tree | 141f505cdbdbda37c02f6115655e6774aff6bb67 | |
| parent | 24f96651c124ac8f2b03c294b03cb7d2531cd4ca (diff) | |
2.66a:v2.66a
* Back port r54747 to 2.66a tag to fix Windows compile error.
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowWin32.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index 93f9ccbf1eb..89fece50caa 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -712,7 +712,7 @@ GHOST_TSuccess GHOST_WindowWin32::initMultisample(PIXELFORMATDESCRIPTOR pfd) WGL_ACCELERATION_ARB, WGL_FULL_ACCELERATION_ARB, WGL_COLOR_BITS_ARB, pfd.cColorBits, WGL_DEPTH_BITS_ARB, pfd.cDepthBits, - WGL_ALPHA_BITS_ART, pfd.cAlphaBits, + WGL_ALPHA_BITS_ARB, pfd.cAlphaBits, WGL_STENCIL_BITS_ARB, pfd.cStencilBits, WGL_DOUBLE_BUFFER_ARB, GL_TRUE, WGL_SAMPLE_BUFFERS_ARB, GL_TRUE, @@ -1322,7 +1322,7 @@ static int WeightPixelFormat(PIXELFORMATDESCRIPTOR& pfd) weight += pfd.cColorBits - 8; - if (pdf.cAlphaBits > 0) + if (pfd.cAlphaBits > 0) weight ++; /* want swap copy capability -- it matters a lot */ |