2 files changed, 17 insertions, 12 deletions

diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
index e21a4264410..a5948deea7a 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
@@ -139,6 +139,7 @@ int NonTVertex___init__(BPy_NonTVertex *self, PyObject *args, PyObject *kwds)
 
 	self->py_vv.vv = self->ntv;
 	self->py_vv.py_if0D.if0D = self->ntv;
+	self->py_vv.py_if0D.borrowed = 0;
 
 	return 0;
 }
@@ -151,16 +152,17 @@ PyObject * NonTVertex_castToSVertex( BPy_NonTVertex *self ) {
 }
 
 PyObject * NonTVertex_castToViewVertex( BPy_NonTVertex *self ) {
-	return BPy_ViewVertex_from_ViewVertex_ptr( self->ntv->castToViewVertex() );
+	return BPy_ViewVertex_from_ViewVertex( *(self->ntv->castToViewVertex()) );
 }
 
 PyObject * NonTVertex_castToNonTVertex( BPy_NonTVertex *self ) {
-	return BPy_NonTVertex_from_NonTVertex_ptr( self->ntv->castToNonTVertex() );
+	return BPy_NonTVertex_from_NonTVertex( *(self->ntv->castToNonTVertex()) );
 }
 
 PyObject * NonTVertex_svertex( BPy_NonTVertex *self ) {
-	if( self->ntv->svertex() ){
-		return BPy_SVertex_from_SVertex_ptr( self->ntv->svertex() );
+	SVertex *v = self->ntv->svertex();
+	if( v ){
+		return BPy_SVertex_from_SVertex( *v );
 	}
 
 	Py_RETURN_NONE;
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
index 4ac3d3dd170..6eb97055576 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
@@ -134,30 +134,33 @@ int TVertex___init__(BPy_TVertex *self, PyObject *args, PyObject *kwds)
 	self->tv = new TVertex();
 	self->py_vv.vv = self->tv;
 	self->py_vv.py_if0D.if0D = self->tv;
+	self->py_vv.py_if0D.borrowed = 0;
 
 	return 0;
 }
 
 
 PyObject * TVertex_castToViewVertex( BPy_TVertex *self ) {
-	return BPy_ViewVertex_from_ViewVertex_ptr( self->tv->castToViewVertex() );
+	return BPy_ViewVertex_from_ViewVertex( *(self->tv->castToViewVertex()) );
 }
 
 PyObject * TVertex_castToTVertex( BPy_TVertex *self ) {
-	return BPy_TVertex_from_TVertex_ptr( self->tv->castToTVertex() );
+	return BPy_TVertex_from_TVertex( *(self->tv->castToTVertex()) );
 }
 
 PyObject * TVertex_frontSVertex( BPy_TVertex *self ) {
-	if( self->tv->frontSVertex() ){
-		return BPy_SVertex_from_SVertex_ptr( self->tv->frontSVertex() );
+	SVertex *v = self->tv->frontSVertex();
+	if( v ){
+		return BPy_SVertex_from_SVertex( *v );
 	}
 
 	Py_RETURN_NONE;
 }
 
 PyObject * TVertex_backSVertex( BPy_TVertex *self ) {
-	if( self->tv->backSVertex() ){
-		return BPy_SVertex_from_SVertex_ptr( self->tv->backSVertex() );
+	SVertex *v = self->tv->backSVertex();
+	if( v ){
+		return BPy_SVertex_from_SVertex( *v );
 	}
 
 	Py_RETURN_NONE;
@@ -205,7 +208,7 @@ PyObject * TVertex_getSVertex( BPy_TVertex *self, PyObject *args) {
 
 	SVertex *sv = self->tv->getSVertex( ((BPy_FEdge *) py_fe)->fe );
 	if( sv ){
-		return BPy_SVertex_from_SVertex_ptr( sv );
+		return BPy_SVertex_from_SVertex( *sv );
 	}
 
 	Py_RETURN_NONE;
@@ -219,7 +222,7 @@ PyObject * TVertex_mate( BPy_TVertex *self, PyObject *args) {
 
 	ViewEdge *ve = self->tv->mate( ((BPy_ViewEdge *) py_ve)->ve );
 	if( ve ){
-		return BPy_ViewEdge_from_ViewEdge_ptr( ve );
+		return BPy_ViewEdge_from_ViewEdge( *ve );
 	}
 
 	Py_RETURN_NONE;