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

2 files changed, 13 insertions, 2 deletions

diff --git a/source/blender/python/generic/bgl.c b/source/blender/python/generic/bgl.c
index d18720598d1..08b8fa28db4 100644
--- a/source/blender/python/generic/bgl.c
+++ b/source/blender/python/generic/bgl.c
@@ -303,7 +303,7 @@ static PyObject *Buffer_new(PyTypeObject *UNUSED(type), PyObject *args, PyObject
 	if (!PyArg_ParseTuple(args, "iO|O: bgl.Buffer", &type, &length_ob, &init)) {
 		return NULL;
 	}
-	if (!ELEM5(type, GL_BYTE, GL_SHORT, GL_INT, GL_FLOAT, GL_DOUBLE)) {
+	if (!ELEM(type, GL_BYTE, GL_SHORT, GL_INT, GL_FLOAT, GL_DOUBLE)) {
 		PyErr_SetString(PyExc_AttributeError,
 		                "invalid first argument type, should be one of "
 		                "GL_BYTE, GL_SHORT, GL_INT, GL_FLOAT or GL_DOUBLE");
@@ -1900,9 +1900,20 @@ PyObject *BPyInit_bgl(void)
 	EXPP_ADDCONST(GL_TEXTURE7);
 	EXPP_ADDCONST(GL_TEXTURE8);
 
+	EXPP_ADDCONST(GL_MAX_TEXTURE_UNITS);
+	
 	EXPP_ADDCONST(GL_DEPTH_COMPONENT32);
 	EXPP_ADDCONST(GL_TEXTURE_COMPARE_MODE);
 
+	EXPP_ADDCONST(GL_MAX_VARYING_FLOATS);
+	EXPP_ADDCONST(GL_MAX_VERTEX_ATTRIBS);	
+	EXPP_ADDCONST(GL_MAX_VARYING_FLOATS);
+	EXPP_ADDCONST(GL_MAX_VERTEX_UNIFORM_COMPONENTS);
+	EXPP_ADDCONST(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS);
+	EXPP_ADDCONST(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS);
+	EXPP_ADDCONST(GL_MAX_TEXTURE_IMAGE_UNITS);
+	EXPP_ADDCONST(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS);
+
 	return submodule;
 }
 
diff --git a/source/blender/python/generic/idprop_py_api.c b/source/blender/python/generic/idprop_py_api.c
index dcdda2c440e..8c9e84af8ed 100644
--- a/source/blender/python/generic/idprop_py_api.c
+++ b/source/blender/python/generic/idprop_py_api.c
@@ -1541,7 +1541,7 @@ PyObject *BPyInit_idprop(void)
 }
 
 
-#ifdef DEBUG
+#ifndef NDEBUG
 /* -------------------------------------------------------------------- */
 /* debug only function */