diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-13 13:36:24 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-13 13:36:24 +0300 |
commit | 224edde807d76dcccfdb2b204cfa1739d544eca0 (patch) | |
tree | 034b5e1afecc9473d2932010b88bc8c642f9fe59 /intern/ghost/intern/GHOST_WindowX11.h | |
parent | af2d39d902c0e302a32b979a8d47ff8e067c0d65 (diff) | |
parent | 617c4d6adbfe64b3a72b5c48f918f39d30aa18dc (diff) |
Merge branch 'master' into custom-normals-bmeshcustom-normals-bmesh
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 5beb7b43032..0738e3d47b8 100644 --- a/intern/ghost/intern/GHOST_WindowX11.h +++ b/intern/ghost/intern/GHOST_WindowX11.h @@ -73,6 +73,7 @@ public: * \param parentWindow Parent (embedder) window * \param type The type of drawing context installed in this window. * \param stereoVisual Stereo visual for quad buffered stereo. + * \param alphaBackground Enable alpha blending of window with display background * \param numOfAASamples Number of samples used for AA (zero if no AA) */ GHOST_WindowX11( @@ -88,6 +89,7 @@ public: GHOST_TDrawingContextType type = GHOST_kDrawingContextTypeNone, const bool stereoVisual = false, const bool exclusive = false, + const bool alphaBackground = false, const GHOST_TUns16 numOfAASamples = 0, const bool is_debug = false ); @@ -321,6 +323,7 @@ private: Window m_window; Display *m_display; XVisualInfo *m_visualInfo; + void *m_fbconfig; GHOST_TWindowState m_normal_state; |