[Bf-blender-cvs] [521edaa] decklink: Merge remote-tracking branch 'origin/master' into decklink

[Benoit Bolsee]

Commit: 521edaaf75ad748f0ed4f7608d3a81e74c1c09e5
Author: Benoit Bolsee
Date:   Tue Jun 23 22:58:09 2015 +0200
Branches: decklink
https://developer.blender.org/rB521edaaf75ad748f0ed4f7608d3a81e74c1c09e5

Merge remote-tracking branch 'origin/master' into decklink

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



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

diff --cc intern/ghost/intern/GHOST_WindowX11.cpp
index ec7ae75,bd0d682..79c8ec0
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@@ -399,17 -289,22 +399,23 @@@ GHOST_WindowX11
      : GHOST_Window(width, height, state, stereoVisual, exclusive, numOfAASamples),
        m_display(display),
        m_visualInfo(NULL),
 +      m_fbconfig(NULL),
        m_normal_state(GHOST_kWindowStateNormal),
        m_system(system),
-       m_valid_setup(false),
        m_invalid_window(false),
        m_empty_cursor(None),
        m_custom_cursor(None),
-       m_visible_cursor(None)
+       m_visible_cursor(None),
+ #ifdef WITH_XDND
+       m_dropTarget(NULL),
+ #endif
+ #if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)
+       m_xic(NULL),
+ #endif
+       m_valid_setup(false)
  {
  	if (type == GHOST_kDrawingContextTypeOpenGL) {
 -		m_visualInfo = x11_visualinfo_from_glx(m_display, stereoVisual, &m_wantNumOfAASamples);
 +		m_visualInfo = x11_visualinfo_from_glx(m_display, stereoVisual, &m_wantNumOfAASamples, alphaBackground, (GLXFBConfig*)&m_fbconfig);
  	}
  	else {
  		XVisualInfo tmp = {0};