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, 6 insertions, 3 deletions

diff --git a/source/blender/python/mathutils/mathutils_Vector.c b/source/blender/python/mathutils/mathutils_Vector.c
index a719691d5d4..15a9860be0a 100644
--- a/source/blender/python/mathutils/mathutils_Vector.c
+++ b/source/blender/python/mathutils/mathutils_Vector.c
@@ -814,17 +814,20 @@ static PyObject *Vector_orthogonal(VectorObject *self)
 {
 	float vec[3];
 
-	if (self->size != 3) {
+	if (self->size > 3) {
 		PyErr_SetString(PyExc_TypeError,
 		                "Vector.orthogonal(): "
-		                "Vector must be 3D");
+		                "Vector must be 3D or 2D");
 		return NULL;
 	}
 
 	if (BaseMath_ReadCallback(self) == -1)
 		return NULL;
 
-	ortho_v3_v3(vec, self->vec);
+	if (self->size == 3)
+		ortho_v3_v3(vec, self->vec);
+	else
+		ortho_v2_v2(vec, self->vec);
 
 	return Vector_CreatePyObject(vec, self->size, Py_NEW, Py_TYPE(self));
 }