diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-23 08:04:03 +0300 |
| commit | 9282d305bdc56522543129436db1e8a5d19cf39f (patch) | |
| tree | b6d0cdcc7dd3f4113cf9e4f9813c40f44d29746e /intern/ghost/intern/GHOST_WindowX11.h | |
| parent | de724a258eda45d1fed2b2176006c3b2df8abea2 (diff) | |
| parent | 646a96bf8edc211a06f3df652101c265ee166e8d (diff) | |
Merge branch 'master' into texture_nodes_refactortexture_nodes_refactor
Conflicts:
source/blender/nodes/texture/nodes/node_texture_math.c
Diffstat (limited to 'intern/ghost/intern/GHOST_WindowX11.h')
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowX11.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/ghost/intern/GHOST_WindowX11.h b/intern/ghost/intern/GHOST_WindowX11.h index 3255751be93..7bb9a858882 100644 --- a/intern/ghost/intern/GHOST_WindowX11.h +++ b/intern/ghost/intern/GHOST_WindowX11.h @@ -35,6 +35,7 @@ #include "GHOST_Window.h" #include <X11/Xlib.h> +#include <X11/Xutil.h> // For tablets #ifdef WITH_X11_XINPUT # include <X11/extensions/XInput.h> @@ -319,6 +320,8 @@ private: Window m_window; Display *m_display; + XVisualInfo *m_visualInfo; + GHOST_TWindowState m_normal_state; /** A pointer to the typed system class. */ |