Added StrokeAttribute class. Beginning of StrokeVertex.

IMPORTANT: The setters functions' names were normalized due to constant confusion regarding capitalization. All the function names start with set... instead of Set.... This convention was changed all throughout Freestyle. To use Freestyle as an external renderer, the SWIG library MUST be regenerated.

7 files changed, 316 insertions, 138 deletions

diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
index f76fc9c9931..e1cf63727e5 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
@@ -14,9 +14,9 @@ static PyObject * CurvePoint___copy__( BPy_CurvePoint *self );
 static PyObject * CurvePoint_A( BPy_CurvePoint *self );
 static PyObject * CurvePoint_B( BPy_CurvePoint *self );
 static PyObject * CurvePoint_t2d( BPy_CurvePoint *self );
-static PyObject *CurvePoint_SetA( BPy_CurvePoint *self , PyObject *args);
-static PyObject *CurvePoint_SetB( BPy_CurvePoint *self , PyObject *args);
-static PyObject *CurvePoint_SetT2d( BPy_CurvePoint *self , PyObject *args);
+static PyObject *CurvePoint_setA( BPy_CurvePoint *self , PyObject *args);
+static PyObject *CurvePoint_setB( BPy_CurvePoint *self , PyObject *args);
+static PyObject *CurvePoint_setT2d( BPy_CurvePoint *self , PyObject *args);
 static PyObject *CurvePoint_curvatureFredo( BPy_CurvePoint *self , PyObject *args);
 
 /*----------------------CurvePoint instance definitions ----------------------------*/
@@ -25,9 +25,9 @@ static PyMethodDef BPy_CurvePoint_methods[] = {
 	{"A", ( PyCFunction ) CurvePoint_A, METH_NOARGS, "（ ）Returns the first SVertex upon which the CurvePoint is built."},
 	{"B", ( PyCFunction ) CurvePoint_B, METH_NOARGS, "（ ）Returns the second SVertex upon which the CurvePoint is built."},
 	{"t2d", ( PyCFunction ) CurvePoint_t2d, METH_NOARGS, "（ ）Returns the interpolation parameter."},
-	{"SetA", ( PyCFunction ) CurvePoint_SetA, METH_VARARGS, "（SVertex sv ）Sets the first SVertex upon which to build the CurvePoint."},
-	{"SetB", ( PyCFunction ) CurvePoint_SetB, METH_VARARGS, "（SVertex sv ）Sets the second SVertex upon which to build the CurvePoint."},
-	{"SetT2d", ( PyCFunction ) CurvePoint_SetT2d, METH_VARARGS, "（ ）Sets the 2D interpolation parameter to use."},
+	{"setA", ( PyCFunction ) CurvePoint_setA, METH_VARARGS, "（SVertex sv ）Sets the first SVertex upon which to build the CurvePoint."},
+	{"setB", ( PyCFunction ) CurvePoint_setB, METH_VARARGS, "（SVertex sv ）Sets the second SVertex upon which to build the CurvePoint."},
+	{"setT2d", ( PyCFunction ) CurvePoint_setT2d, METH_VARARGS, "（ ）Sets the 2D interpolation parameter to use."},
 	{"curvatureFredo", ( PyCFunction ) CurvePoint_curvatureFredo, METH_NOARGS, "（ ）angle in radians."},
 	{NULL, NULL, 0, NULL}
 };
@@ -182,41 +182,41 @@ PyObject * CurvePoint_t2d( BPy_CurvePoint *self ) {
 	return PyFloat_FromDouble( self->cp->t2d() );
 }
 
-PyObject *CurvePoint_SetA( BPy_CurvePoint *self , PyObject *args) {
+PyObject *CurvePoint_setA( BPy_CurvePoint *self , PyObject *args) {
 	PyObject *py_sv;
 
 	if(!( PyArg_ParseTuple(args, "O", &py_sv) && BPy_SVertex_Check(py_sv)  )) {
-		cout << "ERROR: CurvePoint_SetA" << endl;
+		cout << "ERROR: CurvePoint_setA" << endl;
 		Py_RETURN_NONE;
 	}
 
-	self->cp->SetA( ((BPy_SVertex *) py_sv)->sv );
+	self->cp->setA( ((BPy_SVertex *) py_sv)->sv );
 
 	Py_RETURN_NONE;
 }
 
-PyObject *CurvePoint_SetB( BPy_CurvePoint *self , PyObject *args) {
+PyObject *CurvePoint_setB( BPy_CurvePoint *self , PyObject *args) {
 	PyObject *py_sv;
 
 	if(!( PyArg_ParseTuple(args, "O", &py_sv) && BPy_SVertex_Check(py_sv)  )) {
-		cout << "ERROR: CurvePoint_SetB" << endl;
+		cout << "ERROR: CurvePoint_setB" << endl;
 		Py_RETURN_NONE;
 	}
 
-	self->cp->SetB( ((BPy_SVertex *) py_sv)->sv );
+	self->cp->setB( ((BPy_SVertex *) py_sv)->sv );
 
 	Py_RETURN_NONE;
 }
 
-PyObject *CurvePoint_SetT2d( BPy_CurvePoint *self , PyObject *args) {
+PyObject *CurvePoint_setT2d( BPy_CurvePoint *self , PyObject *args) {
 	float t;
 
 	if( !PyArg_ParseTuple(args, "f", &t) ) {
-		cout << "ERROR: CurvePoint_SetT2d" << endl;
+		cout << "ERROR: CurvePoint_setT2d" << endl;
 		Py_RETURN_NONE;
 	}
 
-	self->cp->SetT2d( t );
+	self->cp->setT2d( t );
 
 	Py_RETURN_NONE;
 }
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h
index ac30f74c4dd..e40f261504f 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h
@@ -14,8 +14,7 @@ extern "C" {
 
 extern PyTypeObject CurvePoint_Type;
 
-#define BPy_CurvePoint_Check(v) \
-    ((v)->ob_type == &CurvePoint_Type)
+#define BPy_CurvePoint_Check(v)	(( (PyObject *) v)->ob_type == &CurvePoint_Type)
 
 /*---------------------------Python BPy_CurvePoint structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
index 7f2e364d0b4..69069a68f33 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
@@ -1,104 +1,254 @@
- PyObject *_wrap_StrokeVertex_getExactTypeName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_StrokeVertex__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_StrokeVertex__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_StrokeVertex__SWIG_2(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_StrokeVertex__SWIG_3(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_StrokeVertex__SWIG_4(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_StrokeVertex__SWIG_5(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_StrokeVertex(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_StrokeVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_x(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_y(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_getPoint(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_attribute__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_attribute__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_attribute(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_curvilinearAbscissa(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_strokeLength(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_u(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_SetX(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_SetY(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_SetPoint__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_SetPoint__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_SetPoint(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_SetAttribute(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_SetCurvilinearAbscissa(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_StrokeVertex_SetStrokeLength(PyObject *self , PyObject *args) {
-}
+#include "StrokeVertex.h"
+
+#include "../../Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for StrokeVertex instance  -----------*/
+static int StrokeVertex___init__(BPy_StrokeVertex *self, PyObject *args, PyObject *kwds);
+
+
+/*----------------------StrokeVertex instance definitions ----------------------------*/
+static PyMethodDef BPy_StrokeVertex_methods[] = {	
+//	{"__copy__", ( PyCFunction ) StrokeVertex___copy__, METH_NOARGS, "（ ）Cloning method."},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_StrokeVertex type definition ------------------------------*/
+
+PyTypeObject StrokeVertex_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"StrokeVertex",				/* tp_name */
+	sizeof( BPy_StrokeVertex ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
 
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	NULL,                       /* traverseproc tp_traverse; */
+
+	/* delete references to contained objects */
+	NULL,                       /* inquiry tp_clear; */
+
+  /***  Assigned meaning in release 2.1 ***/
+  /*** rich comparisons ***/
+	NULL,                       /* richcmpfunc tp_richcompare; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_StrokeVertex_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Interface0D_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)StrokeVertex___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int StrokeVertex___init__(BPy_StrokeVertex *self, PyObject *args, PyObject *kwds)
+{
+
+	PyObject *obj1 = 0, *obj2 = 0 , *obj3 = 0;
+
+    if (! PyArg_ParseTuple(args, "|OOO", &obj1, &obj2, &obj3) )
+        return -1;
+
+	if( !obj1 && !obj2 && !obj3 ){
+		self->cp = new CurvePoint();
+	} else if( PyFloat_Check(obj3) ) {
+		if( BPy_SVertex_Check(obj1) && BPy_SVertex_Check(obj2) ) {
+			self->cp = new CurvePoint(  ((BPy_SVertex *) obj1)->sv,
+										((BPy_SVertex *) obj2)->sv,
+										PyFloat_AsDouble( obj3 ) );
+		} else if( BPy_CurvePoint_Check(obj1) && BPy_CurvePoint_Check(obj2) ) {
+			self->cp = new CurvePoint(  ((BPy_CurvePoint *) obj1)->cp,
+										((BPy_CurvePoint *) obj2)->cp,
+										PyFloat_AsDouble( obj3 ) );
+		} else {
+			return -1;	
+		}		
+	} else {
+		return -1;
+	}
+
+	self->py_if0D.if0D = self->cp;
+
+	return 0;
+}
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+//  PyObject *_wrap_StrokeVertex_getExactTypeName(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_StrokeVertex__SWIG_0(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_StrokeVertex__SWIG_1(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_StrokeVertex__SWIG_2(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_StrokeVertex__SWIG_3(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_StrokeVertex__SWIG_4(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_StrokeVertex__SWIG_5(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_StrokeVertex(PyObject *self, PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_delete_StrokeVertex(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_x(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_y(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_getPoint(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_attribute__SWIG_0(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_attribute__SWIG_1(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_attribute(PyObject *self, PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_curvilinearAbscissa(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_strokeLength(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_u(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_SetX(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_SetY(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_SetPoint__SWIG_0(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_SetPoint__SWIG_1(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_SetPoint(PyObject *self, PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_SetAttribute(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_SetCurvilinearAbscissa(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_StrokeVertex_SetStrokeLength(PyObject *self , PyObject *args) {
+// }
+// 
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h
new file mode 100644
index 00000000000..dccecb093f5
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_STROKEVERTEX_H
+#define FREESTYLE_PYTHON_STROKEVERTEX_H
+
+#include "../CurvePoint.h"
+#include "../../stroke/Stroke.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject StrokeVertex_Type;
+
+#define BPy_StrokeVertex_Check(v)	(( (PyObject *) v)->ob_type == &StrokeVertex_Type)
+
+/*---------------------------Python BPy_StrokeVertex structure definition----------*/
+typedef struct {
+	BPy_CurvePoint py_cp;
+	StrokeVertex *sv;
+} BPy_StrokeVertex;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_STROKEVERTEX_H */
diff --git a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
index eb91d7daf10..d0c622d1df2 100644
--- a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
@@ -14,10 +14,10 @@ static int SVertex___init__(BPy_SVertex *self, PyObject *args, PyObject *kwds);
 static PyObject * SVertex___copy__( BPy_SVertex *self );
 static PyObject * SVertex_normals( BPy_SVertex *self );
 static PyObject * SVertex_normalsSize( BPy_SVertex *self );
-static PyObject * SVertex_SetPoint3D( BPy_SVertex *self , PyObject *args);
-static PyObject * SVertex_SetPoint2D( BPy_SVertex *self , PyObject *args);
+static PyObject * SVertex_setPoint3D( BPy_SVertex *self , PyObject *args);
+static PyObject * SVertex_setPoint2D( BPy_SVertex *self , PyObject *args);
 static PyObject * SVertex_AddNormal( BPy_SVertex *self , PyObject *args);
-static PyObject * SVertex_SetId( BPy_SVertex *self , PyObject *args);
+static PyObject * SVertex_setId( BPy_SVertex *self , PyObject *args);
 static PyObject *SVertex_AddFEdge( BPy_SVertex *self , PyObject *args);
 
 /*----------------------SVertex instance definitions ----------------------------*/
@@ -25,10 +25,10 @@ static PyMethodDef BPy_SVertex_methods[] = {
 	{"__copy__", ( PyCFunction ) SVertex___copy__, METH_NOARGS, "（ ）Cloning method."},
 	{"normals", ( PyCFunction ) SVertex_normals, METH_NOARGS, "Returns the normals for this Vertex as a list. In a smooth surface, a vertex has exactly one normal. In a sharp surface, a vertex can have any number of normals."},
 	{"normalsSize", ( PyCFunction ) SVertex_normalsSize, METH_NOARGS, "Returns the number of different normals for this vertex." },
-	{"SetPoint3D", ( PyCFunction ) SVertex_SetPoint3D, METH_VARARGS, "Sets the 3D coordinates of the SVertex." },
-	{"SetPoint2D", ( PyCFunction ) SVertex_SetPoint2D, METH_VARARGS, "Sets the 3D projected coordinates of the SVertex." },
+	{"setPoint3D", ( PyCFunction ) SVertex_setPoint3D, METH_VARARGS, "Sets the 3D coordinates of the SVertex." },
+	{"setPoint2D", ( PyCFunction ) SVertex_setPoint2D, METH_VARARGS, "Sets the 3D projected coordinates of the SVertex." },
 	{"AddNormal", ( PyCFunction ) SVertex_AddNormal, METH_VARARGS, "Adds a normal to the Svertex's set of normals. If the same normal is already in the set, nothing changes." },
-	{"SetId", ( PyCFunction ) SVertex_SetId, METH_VARARGS, "Sets the Id." },
+	{"setId", ( PyCFunction ) SVertex_setId, METH_VARARGS, "Sets the Id." },
 	{"AddFEdge", ( PyCFunction ) SVertex_AddFEdge, METH_VARARGS, "Add an FEdge to the list of edges emanating from this SVertex." },	
 	{NULL, NULL, 0, NULL}
 };
@@ -177,36 +177,36 @@ PyObject * SVertex_normalsSize( BPy_SVertex *self ) {
 	return PyInt_FromLong( self->sv->normalsSize() );
 }
 
-PyObject *SVertex_SetPoint3D( BPy_SVertex *self , PyObject *args) {
+PyObject *SVertex_setPoint3D( BPy_SVertex *self , PyObject *args) {
 	PyObject *py_point;
 
 	if(!( PyArg_ParseTuple(args, "O", &py_point) 
 			&& PyList_Check(py_point) && PyList_Size(py_point) == 3 )) {
-		cout << "ERROR: SVertex_SetPoint3D" << endl;
+		cout << "ERROR: SVertex_setPoint3D" << endl;
 		Py_RETURN_NONE;
 	}
 
 	Vec3r v( 	PyFloat_AsDouble( PyList_GetItem(py_point, 0) ),
 				PyFloat_AsDouble( PyList_GetItem(py_point, 1) ),
 				PyFloat_AsDouble( PyList_GetItem(py_point, 2) )  );
-	self->sv->SetPoint3D( v );
+	self->sv->setPoint3D( v );
 
 	Py_RETURN_NONE;
 }
 
-PyObject *SVertex_SetPoint2D( BPy_SVertex *self , PyObject *args) {
+PyObject *SVertex_setPoint2D( BPy_SVertex *self , PyObject *args) {
 	PyObject *py_point;
 
 	if(!( PyArg_ParseTuple(args, "O", &py_point) 
 			&& PyList_Check(py_point) && PyList_Size(py_point) == 3 )) {
-		cout << "ERROR: SVertex_SetPoint2D" << endl;
+		cout << "ERROR: SVertex_setPoint2D" << endl;
 		Py_RETURN_NONE;
 	}
 
 	Vec3r v( 	PyFloat_AsDouble( PyList_GetItem(py_point, 0) ),
 				PyFloat_AsDouble( PyList_GetItem(py_point, 1) ),
 				PyFloat_AsDouble( PyList_GetItem(py_point, 2) )  );
-	self->sv->SetPoint2D( v );
+	self->sv->setPoint2D( v );
 
 	Py_RETURN_NONE;
 }
@@ -228,15 +228,15 @@ PyObject *SVertex_AddNormal( BPy_SVertex *self , PyObject *args) {
 	Py_RETURN_NONE;
 }
 
-PyObject *SVertex_SetId( BPy_SVertex *self , PyObject *args) {
+PyObject *SVertex_setId( BPy_SVertex *self , PyObject *args) {
 	BPy_Id *py_id;
 
 	if( !PyArg_ParseTuple(args, "O", &py_id) ) {
-		cout << "ERROR: SVertex_SetId" << endl;
+		cout << "ERROR: SVertex_setId" << endl;
 		Py_RETURN_NONE;
 	}
 
-	self->sv->SetId( *(py_id->id) );
+	self->sv->setId( *(py_id->id) );
 
 	Py_RETURN_NONE;
 }
diff --git a/source/blender/freestyle/intern/python/Interface0D/SVertex.h b/source/blender/freestyle/intern/python/Interface0D/SVertex.h
index ac89133ab55..099417b5139 100644
--- a/source/blender/freestyle/intern/python/Interface0D/SVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/SVertex.h
@@ -15,8 +15,7 @@ extern "C" {
 
 extern PyTypeObject SVertex_Type;
 
-#define BPy_SVertex_Check(v) \
-    ((v)->ob_type == &SVertex_Type)
+#define BPy_SVertex_Check(v)	(( (PyObject *) v)->ob_type == &SVertex_Type)
 
 /*---------------------------Python BPy_SVertex structure definition----------*/
 typedef struct {
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h
index 98eeb504a3d..98bcb9bac90 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h
@@ -15,8 +15,7 @@ extern "C" {
 
 extern PyTypeObject ViewVertex_Type;
 
-#define BPy_ViewVertex_Check(v) \
-    ((v)->ob_type == &ViewVertex_Type)
+#define BPy_ViewVertex_Check(v)	(( (PyObject *) v)->ob_type == &ViewVertex_Type)
 
 /*---------------------------Python BPy_ViewVertex structure definition----------*/
 typedef struct {