diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-09-11 08:14:27 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-11 08:14:27 +0400 |
| commit | f81f6c5019bc84c0839210c75a608bcf17e91df7 (patch) | |
| tree | c2463c9b462c2435688921a06a5dff04d7cb652b /intern | |
| parent | a4f12a3e31d7c5b763fc75a984e0e9983c707e03 (diff) | |
take the decender into account when drawing console text.
also add data types wm and mask to dataname() and unshadow var in ghost/x11
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowX11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 3173736c2a5..25c74a0a6cb 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -182,7 +182,6 @@ GHOST_WindowX11( * X can find us a visual matching those requirements. */ int attributes[40], i, samples; - Atom atoms[2]; int natom; int glxVersionMajor, glxVersionMinor; /* As in GLX major.minor */ @@ -405,6 +404,7 @@ GHOST_WindowX11( /* The basic for a good ICCCM "work" */ if (m_system->m_atom.WM_PROTOCOLS) { + Atom atoms[2]; natom = 0; if (m_system->m_atom.WM_DELETE_WINDOW) { |