Merged changes in the trunk up to revision 42116.

2 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index e3f979fea8f..01567b18142 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -58,21 +58,21 @@ PyObject * Vector_from_Vec2f( Vec2f& vec ) {
 	float vec_data[2]; // because vec->_coord is protected
 
 	vec_data[0] = vec.x();		vec_data[1] = vec.y();
-	return newVectorObject( vec_data, 2, Py_NEW, NULL);
+	return Vector_CreatePyObject( vec_data, 2, Py_NEW, NULL);
 }
 
 PyObject * Vector_from_Vec3f( Vec3f& vec ) {
 	float vec_data[3]; // because vec->_coord is protected
 	
 	vec_data[0] = vec.x();		vec_data[1] = vec.y(); 		vec_data[2] = vec.z(); 
-	return newVectorObject( vec_data, 3, Py_NEW, NULL);
+	return Vector_CreatePyObject( vec_data, 3, Py_NEW, NULL);
 }
 
 PyObject * Vector_from_Vec3r( Vec3r& vec ) {
 	float vec_data[3]; // because vec->_coord is protected
 	
 	vec_data[0] = vec.x();		vec_data[1] = vec.y(); 		vec_data[2] = vec.z(); 
-	return newVectorObject( vec_data, 3, Py_NEW, NULL);
+	return Vector_CreatePyObject( vec_data, 3, Py_NEW, NULL);
 }
 
 PyObject * BPy_Id_from_Id( Id& id ) {
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
index 36a49141fb9..9360201b035 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
@@ -128,10 +128,10 @@ static PyObject *Freestyle_blendRamp( PyObject *self, PyObject *args )
 	a[0] = v1->x(); b[0] = v2->x();
 	a[1] = v1->y(); b[1] = v2->y();
 	a[2] = v1->z(); b[2] = v2->z();
-	ramp_blend(type, &a[0], &a[1], &a[2], fac, b);
+	ramp_blend(type, a, fac, b);
 	delete v1;
 	delete v2;
-	return newVectorObject( a, 3, Py_NEW, NULL);
+	return Vector_CreatePyObject( a, 3, Py_NEW, NULL);
 
 error:
 	if (v1) delete v1;
@@ -170,7 +170,7 @@ static PyObject *Freestyle_evaluateColorRamp( PyObject *self, PyObject *args )
 		PyErr_SetString(PyExc_ValueError, "failed to evaluate the color ramp");
 		return NULL;
 	}
-	return newVectorObject( out, 4, Py_NEW, NULL);
+	return Vector_CreatePyObject( out, 4, Py_NEW, NULL);
 }
 
 #include "DNA_color_types.h"