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, 7 insertions, 2 deletions

diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index 78c3599b7cd..dbd836bc562 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -387,9 +387,14 @@ PyObject *BPy_IntegrationType_from_IntegrationType(IntegrationType i)
 PyObject *BPy_CurvePoint_from_CurvePoint(CurvePoint& cp)
 {
 	PyObject *py_cp = CurvePoint_Type.tp_new(&CurvePoint_Type, 0, 0);
-	((BPy_CurvePoint *) py_cp)->cp = &cp;
+	// CurvePointIterator::operator*() returns a reference of a class data
+	// member whose value is mutable upon iteration over different CurvePoints.
+	// It is likely that such a mutable reference is passed to this function,
+	// so that a new allocated CurvePoint instance is created here to avoid
+	// nasty bugs (cf. T41464).
+	((BPy_CurvePoint *) py_cp)->cp = new CurvePoint(cp);
 	((BPy_CurvePoint *) py_cp)->py_if0D.if0D = ((BPy_CurvePoint *)py_cp)->cp;
-	((BPy_CurvePoint *) py_cp)->py_if0D.borrowed = true;
+	((BPy_CurvePoint *) py_cp)->py_if0D.borrowed = false;
 	return py_cp;
 }