[Bf-blender-cvs] [3e454e0] soc-2014-viewport_fx: oops, some typos made it into the GLX context commit

[Jason Wilkins]

Commit: 3e454e0c5d8a2a4d1a0b45cb25a00500177c19d5
Author: Jason Wilkins
Date:   Thu Jul 10 07:29:47 2014 -0500
https://developer.blender.org/rB3e454e0c5d8a2a4d1a0b45cb25a00500177c19d5

oops, some typos made it into the GLX context commit

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

M       intern/ghost/intern/GHOST_ContextGLX.cpp
M       intern/ghost/intern/GHOST_WindowX11.cpp

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

diff --git a/intern/ghost/intern/GHOST_ContextGLX.cpp 
b/intern/ghost/intern/GHOST_ContextGLX.cpp
index f5db9bf..c05177d 100644
--- a/intern/ghost/intern/GHOST_ContextGLX.cpp
+++ b/intern/ghost/intern/GHOST_ContextGLX.cpp
@@ -85,13 +85,13 @@ GHOST_ContextGLX::~GHOST_ContextGLX()
                if (m_context == ::glXGetCurrentContext())
                        ::glXMakeCurrent(m_display, m_window, NULL);
 
-               if (m_context != m_sharedContext || m_sharedCount == 1) {
-                       assert(m_sharedCount > 0);
+               if (m_context != s_sharedContext || s_sharedCount == 1) {
+                       assert(s_sharedCount > 0);
 
-                       m_sharedCount--;
+                       s_sharedCount--;
 
-                       if (m_sharedCount == 0)
-                               m_sharedContext = NULL;
+                       if (s_sharedCount == 0)
+                               s_sharedContext = NULL;
 
                        ::glXDestroyContext(m_display, m_context);
                }
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp 
b/intern/ghost/intern/GHOST_WindowX11.cpp
index 8df4fd4..fbdd0f7 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -189,12 +189,12 @@ GHOST_WindowX11(
        XSetWindowAttributes xattributes;
        memset(&xattributes, 0, sizeof(xattributes));
 
-       xattributes_valuemask |= CBorderPixel;
+       xattributes_valuemask |= CWBorderPixel;
        xattributes.border_pixel = 0;
 
        /* Specify which events we are interested in hearing. */
 
-       xattribute_valuemask |= CWEventMask;
+       xattributes_valuemask |= CWEventMask;
        xattributes.event_mask =
                ExposureMask       | StructureNotifyMask |
                KeyPressMask       | KeyReleaseMask      |

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