Merge branch 'master' into soc-2014-viewport_fxsoc-2014-viewport_fx

I have resolved some differences, for instance selection code which was more or less a stub, to be
the same as master. This will have to be fixed later.

Conflicts:
	CMakeLists.txt
	intern/ghost/CMakeLists.txt
	intern/ghost/intern/GHOST_SystemWin32.cpp
	intern/ghost/intern/GHOST_Window.cpp
	intern/ghost/intern/GHOST_WindowWin32.cpp
	intern/ghost/intern/GHOST_WindowX11.cpp
	source/blender/blenlib/BLI_math_matrix.h
	source/blender/blenlib/intern/math_matrix.c
	source/blender/gpu/CMakeLists.txt
	source/blender/gpu/GPU_select.h
	source/blender/gpu/intern/gpu_buffers.c
	source/blender/gpu/intern/gpu_draw.c
	source/blender/gpu/intern/gpu_extensions.c
	source/blender/gpu/intern/gpu_select.c
	source/blender/gpu/shaders/gpu_shader_simple_vert.glsl
	source/blender/nodes/CMakeLists.txt

1 files changed, 5 insertions, 6 deletions

diff --git a/intern/ghost/intern/GHOST_DisplayManagerX11.cpp b/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
index f63a93eebb8..24289e6b006 100644
--- a/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
+++ b/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
@@ -42,10 +42,9 @@
 
 GHOST_DisplayManagerX11::
 GHOST_DisplayManagerX11(
-    GHOST_SystemX11 *system
-    ) :
-	GHOST_DisplayManager(),
-	m_system(system)
+        GHOST_SystemX11 *system)
+    : GHOST_DisplayManager(),
+      m_system(system)
 {
 	/* nothing to do. */
 }
@@ -195,7 +194,7 @@ setCurrentDisplaySetting(
 		fprintf(stderr, "Error: XF86VidMode extension missing!\n");
 		return GHOST_kFailure;
 	}
-#  ifdef _DEBUG
+#  ifdef DEBUG
 	printf("Using XFree86-VidModeExtension Version %d.%d\n",
 	       majorVersion, minorVersion);
 #  endif
@@ -241,7 +240,7 @@ setCurrentDisplaySetting(
 		}
 
 		if (best_fit != -1) {
-#  ifdef _DEBUG
+#  ifdef DEBUG
 			printf("Switching to video mode %dx%d %dx%d %d\n",
 			       vidmodes[best_fit]->hdisplay, vidmodes[best_fit]->vdisplay,
 			       vidmodes[best_fit]->htotal, vidmodes[best_fit]->vtotal,