soc-2008-mxcurioni: first part of the Freestyle Python implementation. A new Freestyle module is added. The following modules are implemented: BinaryPredicate0D, BinaryPredicate1D, Id, Interface0D, Interface1D. I added a Convert module to help in the creation of Python objects for Freestyle's data structures. I also added a missing file for guarded_alloc needed for compilation on Windows.

148 files changed, 2386 insertions, 1311 deletions

diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript
index 31715bda5a3..98a66e272be 100644
--- a/source/blender/freestyle/SConscript
+++ b/source/blender/freestyle/SConscript
@@ -56,10 +56,22 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
 prefix = 'intern/app_blender'
 app_sources = env.Glob(prefix + '/*.cpp')
 
+#	Python
+prefix = 'intern/python'
+# python_sources = env.Glob(prefix + '/*.cpp')
+python_sources = [
+					prefix + '/Freestyle.cpp',
+					prefix + '/Convert.cpp',
+					prefix + '/BinaryPredicate0D.cpp',
+					prefix + '/BinaryPredicate1D.cpp',
+					prefix + '/Id.cpp',
+					prefix + '/Interface0D.cpp',
+					prefix + '/Interface1D.cpp'
+				]
 
 sources = 	system_sources + image_sources + geometry_sources + scene_graph_sources \
 		  +	winged_edge_sources + view_map_sources + stroke_sources + rendering_sources \
-		  + app_sources
+		  + app_sources + python_sources
 
 env.BlenderLib (libname="bf_freestyle",
 				sources=sources,
diff --git a/source/blender/freestyle/intern/app_blender/api.cpp b/source/blender/freestyle/intern/app_blender/api.cpp
index 2395df646f0..2468839bdc7 100644
--- a/source/blender/freestyle/intern/app_blender/api.cpp
+++ b/source/blender/freestyle/intern/app_blender/api.cpp
@@ -106,12 +106,11 @@ extern "C" {
 
 	void FRS_render(Render* re, int render_in_layer) {
 		
-		// if(render_in_layer) {
-		// 	view->workingBuffer = GL_COLOR_ATTACHMENT0_EXT;
-		// } else {
-		// 	view->workingBuffer = GL_BACK;
-		// }
-		view->workingBuffer = GL_BACK;
+		if(render_in_layer) {
+			view->workingBuffer = GL_COLOR_ATTACHMENT1_EXT;
+		} else {
+			view->workingBuffer = GL_BACK;
+		}
 		
 		// add style module
 		string style_module = pathconfig->getProjectDir() + 
@@ -132,76 +131,52 @@ extern "C" {
 
 	void FRS_execute(Render* re, int render_in_layer) {
 		
-		GLuint framebuffer, renderbuffers[2];
-		GLenum status;
-		RenderLayer *rl;
-		GLubyte *pixc;
-		
 		if(render_in_layer) {
-			
-			pixc = (GLubyte *) malloc( 4 * re->winx * re->winy * sizeof(GLubyte) );
-			
-			cout << "Freestyle as a render layer - SETUP" << endl;
-		
-			// set up frame buffer
-			glGenFramebuffersEXT(1, &framebuffer);
-			glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, framebuffer);
 
-			// set up render buffer: one color buffer, one depth buffer
-			glGenRenderbuffersEXT(2, renderbuffers);
-			
-			glBindRenderbufferEXT(GL_RENDERBUFFER_EXT,	renderbuffers[0]);
-			glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA, re->winx, re->winy);
-			glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_RENDERBUFFER_EXT, renderbuffers[0]);
-			
-			glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, renderbuffers[1]);
-			glRenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_DEPTH_COMPONENT, re->winx, re->winy);
-			glFramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT, renderbuffers[1]);
-
-			// status verification 
-			status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
-			if (status != GL_FRAMEBUFFER_COMPLETE_EXT){
-				cout << "Framebuffer setup error" << endl;
-				glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-				glDeleteRenderbuffersEXT(2, renderbuffers);
-				glDeleteFramebuffersEXT(1, &framebuffer);
-				return;
-			}
-			
-			glPushAttrib(GL_VIEWPORT_BIT);
-			glDrawBuffer(GL_COLOR_ATTACHMENT0_EXT); // should not be needed
-			glViewport(0, 0, re->winx, re->winy);
-			
-			FRS_render(re, render_in_layer);
-
-			// keep first Freestyle layer
+		// 	GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
+		// 	switch(status){
+		// 		case GL_FRAMEBUFFER_COMPLETE_EXT:
+		// 		cout << "CORRECT: GL_FRAMEBUFFER_COMPLETE" << endl;
+		// 		break;
+		// 		case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT: 
+		// 		cout << "ERROR: GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT" << endl;
+		// 		break;
+		// 		case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT: 
+		// 		cout << "ERROR: GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT" << endl;
+		// 		break;
+		// 		case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT: 
+		// 		cout << "ERROR: GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT" << endl;
+		// 		break;
+		// 		case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT: 
+		// 		cout << "ERROR: GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT" << endl;
+		// 		break;
+		// 		case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT: 
+		// 		cout << "ERROR: GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT" << endl;
+		// 		break;
+		// 		case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT: 
+		// 		cout << "ERROR: GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT" << endl;
+		// 		break;
+		// 		case GL_FRAMEBUFFER_UNSUPPORTED_EXT: 
+		// 		cout << "ERROR: GL_FRAMEBUFFER_UNSUPPORTED" << endl;
+		// 		break;
+		// }
+		
+			RenderLayer *rl;
+		
 			for(rl = (RenderLayer *)re->result->layers.first; rl; rl= rl->next)
 				if(rl->layflag & SCE_LAY_FRS)
 					break;
-
-			cout << "Freestyle as a render layer - RESULT" << endl;
-
-			// transfer render to layer
-			glReadBuffer(GL_COLOR_ATTACHMENT0_EXT);
-			glReadPixels(0, 0, re->winx, re->winy, GL_RGBA, GL_UNSIGNED_BYTE, pixc );
-
+			
 			int p;
-			for(int i = 0; i < re->winx; i++) {
-				for(int j = 0; j < re->winy; j++){
-					p = 4*(i*re->winy + j);
-					*(rl->rectf + p    ) = 1.0*pixc[ p ]/255.0;
-					*(rl->rectf + p + 1) = 1.0*pixc[ p+1 ]/255.0;
-					*(rl->rectf + p + 2) = 1.0*pixc[ p+2 ]/255.0;
-					*(rl->rectf + p + 3) = 1.0*pixc[ p+3 ]/255.0;
+			for(int j = 0; j < re->winy; j++) {
+				for(int i = 0; i < re->winx; i++){
+					p = 4*(j*re->winx + i);
+					rl->rectf[p]      *= 0.6;
+					rl->rectf[p + 1]  = 0.6 * rl->rectf[p + 1];
+					rl->rectf[p + 2] *= 0.6;
+					rl->rectf[p + 3]  = 1.0;
 				}
 			}
-
-			// bind window
-			glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
-			glDrawBuffer(GL_BACK);
-			glPopAttrib();
-			glDeleteRenderbuffersEXT(2, renderbuffers);
-			glDeleteFramebuffersEXT(1, &framebuffer);
 			
 		} else {
 			FRS_render(re, render_in_layer);
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
index ea7b1fcca89..2c16adb7a82 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
@@ -1,8 +1,147 @@
-SWIGINTERN PyObject *_wrap_BinaryPredicate0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+#include "BinaryPredicate0D.h"
+
+#include "Convert.h"
+#include "Interface0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+
+/*-----------------------Python API function prototypes for the BinaryPredicate0D module--*/
+//static PyObject *Freestyle_testOutput( BPy_Freestyle * self );
+/*-----------------------BinaryPredicate0D module doc strings-----------------------------*/
+static char M_BinaryPredicate0D_doc[] = "The Blender.Freestyle.BinaryPredicate0D submodule";
+/*----------------------BinaryPredicate0D module method def----------------------------*/
+struct PyMethodDef M_BinaryPredicate0D_methods[] = {
+//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Freestyle method def------------------------------*/
+
+PyTypeObject BinaryPredicate0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"BinaryPredicate0D",				/* tp_name */
+	sizeof( BPy_BinaryPredicate0D ),	/* 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, 		/* 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 ***/
+	NULL,						/* struct PyMethodDef *tp_methods; */
+	NULL,                       /* struct PyMemberDef *tp_members; */
+	NULL,         				/* struct PyGetSetDef *tp_getset; */
+	NULL,                       /* struct _typeobject *tp_base; */
+	NULL,                       /* PyObject *tp_dict; */
+	NULL,                       /* descrgetfunc tp_descr_get; */
+	NULL,                       /* descrsetfunc tp_descr_set; */
+	0,                          /* long tp_dictoffset; */
+	NULL,                       /* 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--------------------------------
+PyObject *BinaryPredicate0D_Init( void )
+{
+	PyObject *submodule;
+	
+	if( PyType_Ready( &BinaryPredicate0D_Type ) < 0 )
+		return NULL;
+	
+	submodule = Py_InitModule3( "Blender.Freestyle.BinaryPredicate0D", M_BinaryPredicate0D_methods, M_BinaryPredicate0D_doc );
+	
+	return submodule;
 }
 
+//------------------------INSTANCE METHODS ----------------------------------
 
-SWIGINTERN PyObject *_wrap_BinaryPredicate0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *BinaryPredicate0D_getName( BPy_BinaryPredicate0D *self, PyObject *args)
+{
+	return PyString_FromString( self->bp0D->getName().c_str() );
 }
 
+PyObject *BinaryPredicate0D___call__( BPy_BinaryPredicate0D *self, PyObject *args)
+{
+	BPy_BinaryPredicate0D *obj1;
+	BPy_Interface0D *obj2, *obj3;
+	bool b;
 
+	if (!PyArg_ParseTuple(args,(char *)"OOO:BinaryPredicate0D___call__", &obj1, obj2, &obj3))
+		cout << "ERROR: BinaryPredicate0D___call__ " << endl;		
+	
+	b = self->bp0D->operator()( *(obj2->if0D) , *(obj3->if0D) );
+	return PyBool_from_bool( b );
+
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate0D.h b/source/blender/freestyle/intern/python/BinaryPredicate0D.h
new file mode 100644
index 00000000000..30467d2e565
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BinaryPredicate0D.h
@@ -0,0 +1,37 @@
+#ifndef FREESTYLE_PYTHON_BINARYPREDICATE0D_H
+#define FREESTYLE_PYTHON_BINARYPREDICATE0D_H
+
+#include "../stroke/Predicates0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject BinaryPredicate0D_Type;
+
+#define BPy_BinaryPredicate0D_Check(v) \
+    ((v)->ob_type == &BinaryPredicate0D_Type)
+
+/*---------------------------Python BPy_BinaryPredicate0D structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	BinaryPredicate0D *bp0D;
+} BPy_BinaryPredicate0D;
+
+/*---------------------------Python BPy_BinaryPredicate0D visible prototypes-----------*/
+
+PyObject *BinaryPredicate0D_Init( void );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_BINARYPREDICATE0D_H */
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
index ebf4ab94ecb..d6a99d689bb 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
@@ -1,12 +1,146 @@
-SWIGINTERN PyObject *_wrap_BinaryPredicate1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
+#include "BinaryPredicate1D.h"
+
+#include "Convert.h"
+#include "Interface1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+
+/*-----------------------Python API function prototypes for the BinaryPredicate1D module--*/
+//static PyObject *Freestyle_testOutput( BPy_Freestyle * self );
+/*-----------------------BinaryPredicate1D module doc strings-----------------------------*/
+static char M_BinaryPredicate1D_doc[] = "The Blender.Freestyle.BinaryPredicate1D submodule";
+/*----------------------BinaryPredicate1D module method def----------------------------*/
+struct PyMethodDef M_BinaryPredicate1D_methods[] = {
+//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Freestyle method def------------------------------*/
+
+PyTypeObject BinaryPredicate1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"BinaryPredicate1D",				/* tp_name */
+	sizeof( BPy_BinaryPredicate1D ),	/* 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; */
 
-SWIGINTERN PyObject *_wrap_BinaryPredicate1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT, 		/* 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 ***/
+	NULL,						/* struct PyMethodDef *tp_methods; */
+	NULL,                       /* struct PyMemberDef *tp_members; */
+	NULL,         				/* struct PyGetSetDef *tp_getset; */
+	NULL,                       /* struct _typeobject *tp_base; */
+	NULL,                       /* PyObject *tp_dict; */
+	NULL,                       /* descrgetfunc tp_descr_get; */
+	NULL,                       /* descrsetfunc tp_descr_set; */
+	0,                          /* long tp_dictoffset; */
+	NULL,                       /* 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--------------------------------
+PyObject *BinaryPredicate1D_Init( void )
+{
+	PyObject *submodule;
+	
+	if( PyType_Ready( &BinaryPredicate1D_Type ) < 0 )
+		return NULL;
+	
+	submodule = Py_InitModule3( "Blender.Freestyle.BinaryPredicate1D", M_BinaryPredicate1D_methods, M_BinaryPredicate1D_doc );
+	
+	return submodule;
 }
 
+//------------------------INSTANCE METHODS ----------------------------------
+
+PyObject *BinaryPredicate1D_getName( BPy_BinaryPredicate1D *self, PyObject *args)
+{
+	return PyString_FromString( self->bp1D->getName().c_str() );
+}
 
-SWIGINTERN PyObject *_wrap_disown_BinaryPredicate1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *BinaryPredicate1D___call__( BPy_BinaryPredicate1D *self, PyObject *args)
+{
+	BPy_BinaryPredicate1D *obj1;
+	BPy_Interface1D *obj2, *obj3;
+	bool b;
+	
+	if (!PyArg_ParseTuple(args,(char *)"OOO:BinaryPredicate1D___call__", &obj1, &obj2, &obj3))
+		cout << "ERROR: BinaryPredicate1D___call__ " << endl;		
+	
+	b = self->bp1D->operator()( *(obj2->if1D) , *(obj3->if1D) );
+	return PyBool_from_bool( b );
 }
 
 
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D.h b/source/blender/freestyle/intern/python/BinaryPredicate1D.h
new file mode 100644
index 00000000000..d401c585197
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D.h
@@ -0,0 +1,37 @@
+#ifndef FREESTYLE_PYTHON_BINARYPREDICATE1D_H
+#define FREESTYLE_PYTHON_BINARYPREDICATE1D_H
+
+#include "../stroke/Predicates1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject BinaryPredicate1D_Type;
+
+#define BPy_BinaryPredicate1D_Check(v) \
+    ((v)->ob_type == &BinaryPredicate1D_Type)
+
+/*---------------------------Python BPy_BinaryPredicate1D structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	BinaryPredicate1D *bp1D;
+} BPy_BinaryPredicate1D;
+
+/*---------------------------Python BPy_BinaryPredicate1D visible prototypes-----------*/
+
+PyObject *BinaryPredicate1D_Init( void );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_BINARYPREDICATE1D_H */
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp
index 59946ce22e1..1f1a1ec840b 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/FalseBP1D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_FalseBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FalseBP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FalseBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FalseBP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FalseBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_FalseBP1D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FalseBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_FalseBP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp
index a249a230b87..402e59c3f29 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/Length2DBP1D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_Length2DBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Length2DBP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Length2DBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Length2DBP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Length2DBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_Length2DBP1D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Length2DBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_Length2DBP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp
index d82c4166a09..d980750bb33 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/SameShapeIdBP1D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_SameShapeIdBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SameShapeIdBP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SameShapeIdBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SameShapeIdBP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SameShapeIdBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_SameShapeIdBP1D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_SameShapeIdBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_SameShapeIdBP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp
index b0e5825e0d6..2afd2e163ea 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/TrueBP1D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_TrueBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TrueBP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TrueBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TrueBP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_TrueBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_TrueBP1D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_TrueBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_TrueBP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp
index 3bd22915831..873acd93149 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D/ViewMapGradientNormBP1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_ViewMapGradientNormBP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMapGradientNormBP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMapGradientNormBP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMapGradientNormBP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ViewMapGradientNormBP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ViewMapGradientNormBP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Convert.cpp b/source/blender/freestyle/intern/python/Convert.cpp
new file mode 100644
index 00000000000..c8ceddaf98b
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Convert.cpp
@@ -0,0 +1,54 @@
+#include "Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+static char M_Convert_doc[] = "The Blender.Freestyle.Convert utility submodule";
+/*----------------------Freestyle module method def----------------------------*/
+struct PyMethodDef M_Convert_methods[] = {
+//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
+	{NULL, NULL, 0, NULL}
+};
+
+
+//-------------------MODULE INITIALIZATION--------------------------------
+PyObject *Convert_Init( void )
+{
+	return Py_InitModule3( "Blender.Freestyle.Convert", M_Convert_methods, M_Convert_doc );
+}
+
+//-------------------------------------------------------------------------
+
+PyObject *PyBool_from_bool( bool b ){
+	// SWIG_From_bool
+	return PyBool_FromLong( b ? 1 : 0);
+}
+
+
+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, 3, Py_NEW);
+}
+
+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);
+}
+
+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);
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file
diff --git a/source/blender/freestyle/intern/python/Convert.h b/source/blender/freestyle/intern/python/Convert.h
new file mode 100644
index 00000000000..d1bac93734a
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Convert.h
@@ -0,0 +1,32 @@
+#ifndef FREESTYLE_PYTHON_CONVERT_H
+#define FREESTYLE_PYTHON_CONVERT_H
+
+#include "../geometry/Geom.h"
+using namespace Geometry;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+#include "api2_2x/vector.h"
+#include "api2_2x/gen_utils.h"
+
+PyObject *Convert_Init( void );
+
+PyObject *PyBool_from_bool( bool b );
+
+PyObject *Vector_from_Vec2f( Vec2f v );
+PyObject *Vector_from_Vec3f( Vec3f v );
+PyObject *Vector_from_Vec3r( Vec3r v );
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_CONVERT_H */
diff --git a/source/blender/freestyle/intern/python/CurvePointIterator.cpp b/source/blender/freestyle/intern/python/CurvePointIterator.cpp
index 4e4291a9c88..57dc86ea5e4 100644
--- a/source/blender/freestyle/intern/python/CurvePointIterator.cpp
+++ b/source/blender/freestyle/intern/python/CurvePointIterator.cpp
@@ -1,284 +1,284 @@
-SWIGINTERN PyObject *_wrap_CurvePointIterator__CurvilinearLength_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__CurvilinearLength_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__CurvilinearLength_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__CurvilinearLength_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__step_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__step_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__step_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__step_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator___A_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator___A_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator___A_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator___A_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator___B_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator___B_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator___B_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator___B_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__begin_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__begin_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__begin_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__begin_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__end_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__end_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__end_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__end_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__n_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__n_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__n_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__n_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__currentn_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__currentn_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__currentn_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__currentn_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__t_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__t_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__t_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__t_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__Point_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__Point_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__Point_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__Point_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__CurveLength_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__CurveLength_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator__CurveLength_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator__CurveLength_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurvePointIterator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_CurvePointIterator__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurvePointIterator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_CurvePointIterator__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurvePointIterator__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_CurvePointIterator__SWIG_2(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurvePointIterator(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_CurvePointIterator(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_CurvePointIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_CurvePointIterator(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_copy(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_CastToInterface0DIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_CastToInterface0DIterator(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator___eq__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getObject(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator___deref__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator___deref__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_isBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_isBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_isEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_isEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getPoint3D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getProjectedX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getProjectedY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getProjectedZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getPoint2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getFEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_getNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_castToSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_castToViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_castToNonTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_castToTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_A(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_B(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_B(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_t2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_t2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_SetA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_SetB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_SetT2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_SetT2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_fedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_fedge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_point2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_point2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_point3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_point3d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_normal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_occluders_begin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_occluders_end(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_occluders_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_occluders_size(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_occludee(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_occluded_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_occludee_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_z_discontinuity(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_curvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_curvatureFredo(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePointIterator_directionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurvePointIterator_directionFredo(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Freestyle.cpp b/source/blender/freestyle/intern/python/Freestyle.cpp
new file mode 100644
index 00000000000..e3a5cf91117
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Freestyle.cpp
@@ -0,0 +1,136 @@
+#include "Freestyle.h"
+
+#include "BinaryPredicate0D.h"
+#include "BinaryPredicate1D.h"
+#include "Id.h"
+#include "Interface0D.h"
+#include "Interface1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+
+/*-----------------------Python API function prototypes for the Freestyle module--*/
+//static PyObject *Freestyle_testOutput( BPy_Freestyle * self );
+/*-----------------------Freestyle module doc strings-----------------------------*/
+static char M_Freestyle_doc[] = "The Blender.Freestyle submodule";
+/*----------------------Freestyle module method def----------------------------*/
+struct PyMethodDef M_Freestyle_methods[] = {
+//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Freestyle method def------------------------------*/
+
+PyTypeObject Freestyle_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Freestyle",				/* tp_name */
+	sizeof( BPy_Freestyle ),	/* 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, 		/* 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 ***/
+	NULL,						/* struct PyMethodDef *tp_methods; */
+	NULL,                       /* struct PyMemberDef *tp_members; */
+	NULL,         				/* struct PyGetSetDef *tp_getset; */
+	NULL,                       /* struct _typeobject *tp_base; */
+	NULL,                       /* PyObject *tp_dict; */
+	NULL,                       /* descrgetfunc tp_descr_get; */
+	NULL,                       /* descrsetfunc tp_descr_set; */
+	0,                          /* long tp_dictoffset; */
+	NULL,                       /* 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--------------------------------
+PyObject *Freestyle_Init( void )
+{
+	PyObject *submodule;
+	PyObject *dict;
+	
+	if( PyType_Ready( &Freestyle_Type ) < 0 )
+		return NULL;
+	
+	submodule = Py_InitModule3( "Blender.Freestyle", M_Freestyle_methods, M_Freestyle_doc );
+
+	dict = PyModule_GetDict( submodule );
+	PyDict_SetItemString( dict, "BinaryPredicate0D", BinaryPredicate0D_Init() );
+	PyDict_SetItemString( dict, "BinaryPredicate1D", BinaryPredicate1D_Init() );
+	PyDict_SetItemString( dict, "Interface0D", Interface0D_Init() );
+	PyDict_SetItemString( dict, "Interface1D", Interface1D_Init() );
+	PyDict_SetItemString( dict, "Id", Id_Init() );
+	
+	return submodule;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file
diff --git a/source/blender/freestyle/intern/python/Freestyle.h b/source/blender/freestyle/intern/python/Freestyle.h
new file mode 100644
index 00000000000..7e7ed56f5f2
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Freestyle.h
@@ -0,0 +1,32 @@
+#ifndef FREESTYLE_PYTHON_FREESTYLE_H
+#define FREESTYLE_PYTHON_FREESTYLE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Freestyle_Type;
+
+#define BPy_Freestyle_Check(v) \
+    ((v)->ob_type == &Freestyle_Type)
+
+/*---------------------------Python BPy_Freestyle structure definition----------*/
+typedef struct {
+	PyObject_HEAD 
+} BPy_Freestyle;
+
+/*---------------------------Python BPy_Freestyle visible prototypes-----------*/
+
+PyObject *Freestyle_Init( void );
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_FREESTYLE_H */
diff --git a/source/blender/freestyle/intern/python/Id.cpp b/source/blender/freestyle/intern/python/Id.cpp
index 681db76faab..a835efa78f7 100644
--- a/source/blender/freestyle/intern/python/Id.cpp
+++ b/source/blender/freestyle/intern/python/Id.cpp
@@ -1,32 +1,197 @@
-SWIGINTERN PyObject *_wrap_Id_getFirst(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+#include "Id.h"
+
+#include "Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+
+/*-----------------------Python API function prototypes for the Id module--*/
+//static PyObject *Freestyle_testOutput( BPy_Freestyle * self );
+/*-----------------------Id module doc strings-----------------------------*/
+static char M_Id_doc[] = "The Blender.Freestyle.Id submodule";
+/*----------------------Id module method def----------------------------*/
+struct PyMethodDef M_Id_methods[] = {
+//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Freestyle method def------------------------------*/
+
+PyTypeObject Id_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Id",				/* tp_name */
+	sizeof( BPy_Id ),	/* 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, 		/* 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 ***/
+	NULL,						/* struct PyMethodDef *tp_methods; */
+	NULL,                       /* struct PyMemberDef *tp_members; */
+	NULL,         				/* struct PyGetSetDef *tp_getset; */
+	NULL,                       /* struct _typeobject *tp_base; */
+	NULL,                       /* PyObject *tp_dict; */
+	NULL,                       /* descrgetfunc tp_descr_get; */
+	NULL,                       /* descrsetfunc tp_descr_set; */
+	0,                          /* long tp_dictoffset; */
+	NULL,                       /* 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--------------------------------
+PyObject *Id_Init( void )
+{
+	PyObject *submodule;
+	
+	if( PyType_Ready( &Id_Type ) < 0 )
+		return NULL;
+	
+	submodule = Py_InitModule3( "Blender.Freestyle.Id", M_Id_methods, M_Id_doc );
+	
+	return submodule;
 }
 
+//------------------------INSTANCE METHODS ----------------------------------
 
-SWIGINTERN PyObject *_wrap_Id_getSecond(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Id_getFirst( BPy_Id *self ) {
+	return PyInt_FromLong( self->id->getFirst() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Id_setFirst(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Id_getSecond( BPy_Id *self) {
+	return PyInt_FromLong( self->id->getSecond() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Id_setSecond(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Id_setFirst( BPy_Id *self , PyObject *args) {
+	PyObject * obj1 = 0 ;
+	PyObject * obj2 = 0 ;
+	unsigned int i;
+
+	if( !PyArg_ParseTuple(args, (char *)"OO:Id_setFirst", &obj1, &obj2) )
+		cout << "ERROR: Id_setFirst" << endl;
+
+	i = static_cast<unsigned int>( PyInt_AsLong(obj2) );
+	self->id->setFirst( i );
+
+	Py_RETURN_NONE;
 }
 
 
-SWIGINTERN PyObject *_wrap_Id___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Id_setSecond( BPy_Id *self , PyObject *args) {
+	PyObject * obj1 = 0 ;
+	PyObject * obj2 = 0 ;
+	unsigned int i;
+
+	if( !PyArg_ParseTuple(args, (char *)"OO:Id_setSecond", &obj1, &obj2) )
+		cout << "ERROR: Id_setSecond" << endl;
+
+	i = static_cast<unsigned int>( PyInt_AsLong(obj2) );
+	self->id->setSecond( i );
+
+	Py_RETURN_NONE;
 }
 
+PyObject *Id___eq__( BPy_Id *self , PyObject *args) {
+	BPy_Id * obj1 = 0 ;
+	BPy_Id * obj2 = 0 ;
 
-SWIGINTERN PyObject *_wrap_Id___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+	if( !PyArg_ParseTuple(args, (char *)"OO:Id___eq__", &obj1, &obj2) )
+		cout << "ERROR: Id___eq__" << endl;
+	
+	return PyBool_from_bool( obj1->id == obj2->id );
 }
 
 
-SWIGINTERN PyObject *_wrap_Id___lt__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Id___ne__(PyObject *self , PyObject *args) {
+	BPy_Id * obj1 = 0 ;
+	BPy_Id * obj2 = 0 ;
+
+	if( !PyArg_ParseTuple(args, (char *)"OO:Id___ne__", &obj1, &obj2) )
+		cout << "ERROR: Id___ne__" << endl;
+
+	return PyBool_from_bool( obj1->id != obj2->id );
 }
 
+PyObject *Id___lt__(PyObject *self , PyObject *args) {
+	BPy_Id * obj1 = 0 ;
+	BPy_Id * obj2 = 0 ;
+
+	if( !PyArg_ParseTuple(args, (char *)"OO:Id___lt__", &obj1, &obj2) )
+		cout << "ERROR: Id___lt__" << endl;
 
-SWIGINTERN PyObject *_wrap_delete_Id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+	return PyBool_from_bool( obj1->id < obj2->id );
 }
 
 
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
\ No newline at end of file
diff --git a/source/blender/freestyle/intern/python/Id.h b/source/blender/freestyle/intern/python/Id.h
new file mode 100644
index 00000000000..032f35f7094
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Id.h
@@ -0,0 +1,39 @@
+#ifndef FREESTYLE_PYTHON_ID_H
+#define FREESTYLE_PYTHON_ID_H
+
+#include <iostream>
+using namespace std;
+
+#include "../system/Id.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Id_Type;
+
+#define BPy_Id_Check(v) \
+    ((v)->ob_type == &Id_Type)
+
+/*---------------------------Python BPy_Id structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	Id *id;
+} BPy_Id;
+
+/*---------------------------Python BPy_Id visible prototypes-----------*/
+
+PyObject *Id_Init( void );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_ID_H */
diff --git a/source/blender/freestyle/intern/python/Interface0D.cpp b/source/blender/freestyle/intern/python/Interface0D.cpp
index 54541cdb8cb..e09e0447aa7 100644
--- a/source/blender/freestyle/intern/python/Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D.cpp
@@ -1,68 +1,187 @@
-SWIGINTERN PyObject *_wrap_Interface0D_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
+#include "Interface0D.h"
+
+#include "Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+
+/*-----------------------Python API function prototypes for the Interface0D module--*/
+//static PyObject *Freestyle_testOutput( BPy_Freestyle * self );
+/*-----------------------Interface0D module doc strings-----------------------------*/
+static char M_Interface0D_doc[] = "The Blender.Freestyle.Interface0D submodule";
+/*----------------------Interface0D module method def----------------------------*/
+struct PyMethodDef M_Interface0D_methods[] = {
+//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Freestyle method def------------------------------*/
+
+PyTypeObject Interface0D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Interface0D",				/* tp_name */
+	sizeof( BPy_Interface0D ),	/* 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) */
 
-SWIGINTERN PyObject *_wrap_Interface0D_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
+	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; */
 
-SWIGINTERN PyObject *_wrap_Interface0D_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT, 		/* 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; */
 
-SWIGINTERN PyObject *_wrap_Interface0D_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
+	/* 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; */
 
-SWIGINTERN PyObject *_wrap_Interface0D_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	NULL,						/* struct PyMethodDef *tp_methods; */
+	NULL,                       /* struct PyMemberDef *tp_members; */
+	NULL,         				/* struct PyGetSetDef *tp_getset; */
+	NULL,                       /* struct _typeobject *tp_base; */
+	NULL,                       /* PyObject *tp_dict; */
+	NULL,                       /* descrgetfunc tp_descr_get; */
+	NULL,                       /* descrsetfunc tp_descr_set; */
+	0,                          /* long tp_dictoffset; */
+	NULL,                       /* 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--------------------------------
+PyObject *Interface0D_Init( void )
+{
+	PyObject *submodule;
+	
+	if( PyType_Ready( &Interface0D_Type ) < 0 )
+		return NULL;
+	
+	submodule = Py_InitModule3( "Blender.Freestyle.Interface0D", M_Interface0D_methods, M_Interface0D_doc );
+	
+	return submodule;
 }
 
+//------------------------INSTANCE METHODS ----------------------------------
 
-SWIGINTERN PyObject *_wrap_Interface0D_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getExactTypeName( BPy_Interface0D *self ) {
+	return PyString_FromString( self->if0D->getExactTypeName().c_str() );	
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getX( BPy_Interface0D *self ) {
+	return PyFloat_FromDouble( self->if0D->getX() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getY( BPy_Interface0D *self ) {
+	return PyFloat_FromDouble( self->if0D->getY() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getZ( BPy_Interface0D *self ) {
+	return PyFloat_FromDouble( self->if0D->getZ() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getPoint3D( BPy_Interface0D *self ) {
+	return Vector_from_Vec3f( self->if0D->getPoint3D() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getProjectedX( BPy_Interface0D *self ) {
+	return PyFloat_FromDouble( self->if0D->getProjectedX() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getProjectedY( BPy_Interface0D *self ) {
+	return PyFloat_FromDouble( self->if0D->getProjectedY() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getProjectedZ( BPy_Interface0D *self ) {
+	return PyFloat_FromDouble( self->if0D->getProjectedZ() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getPoint2D( BPy_Interface0D *self ) {
+	return Vector_from_Vec2f( self->if0D->getPoint2D() );
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getFEdge( BPy_Interface0D *self ) {
+	// FEdge
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0D_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getId( BPy_Interface0D *self ) {
+	// Id
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Interface0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface0D_getNature( BPy_Interface0D *self ) {
+	// VertexNature
 }
 
 
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/source/blender/freestyle/intern/python/Interface0D.h b/source/blender/freestyle/intern/python/Interface0D.h
new file mode 100644
index 00000000000..e3e97cbaecd
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface0D.h
@@ -0,0 +1,36 @@
+#ifndef FREESTYLE_PYTHON_INTERFACE0D_H
+#define FREESTYLE_PYTHON_INTERFACE0D_H
+
+#include "../view_map/Interface0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Interface0D_Type;
+
+#define BPy_Interface0D_Check(v) \
+    ((v)->ob_type == &Interface0D_Type)
+
+/*---------------------------Python BPy_Interface0D structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	Interface0D *if0D;
+} BPy_Interface0D;
+
+/*---------------------------Python BPy_Interface0D visible prototypes-----------*/
+
+PyObject *Interface0D_Init( void );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_INTERFACE0D_H */
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
index 7d966185449..6591973f8b3 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
@@ -1,176 +1,176 @@
-SWIGINTERN PyObject *_wrap_CurvePoint_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getPoint3D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getProjectedX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getProjectedY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getProjectedZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getPoint2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getFEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_getNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_castToSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_castToViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_castToNonTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_castToTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurvePoint__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_CurvePoint__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurvePoint__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_CurvePoint__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurvePoint__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_CurvePoint__SWIG_2(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurvePoint__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_CurvePoint__SWIG_3(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurvePoint(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_CurvePoint(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_CurvePoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_CurvePoint(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint___eq__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_A(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_B(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_B(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_t2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_t2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_SetA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_SetB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_SetT2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_SetT2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_fedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_fedge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_point2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_point2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_point3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_point3d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_normal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_occluders_begin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_occluders_end(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_occluders_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_occluders_size(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_occludee(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_occluded_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_occludee_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_z_discontinuity(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_curvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_curvatureFredo(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurvePoint_directionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *CurvePoint_directionFredo(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
index aa98b1cc008..7f2e364d0b4 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/StrokeVertex.cpp
@@ -1,104 +1,104 @@
-SWIGINTERN PyObject *_wrap_StrokeVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_StrokeVertex__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_StrokeVertex__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_StrokeVertex__SWIG_2(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_StrokeVertex__SWIG_3(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_4(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_StrokeVertex__SWIG_4(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_StrokeVertex__SWIG_5(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_StrokeVertex__SWIG_5(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_StrokeVertex(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_StrokeVertex(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_StrokeVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_StrokeVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_x(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_x(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_y(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_y(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_getPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_getPoint(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_attribute__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_attribute__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_attribute__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_attribute__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_attribute(PyObject *self, PyObject *args) {
+ PyObject *_wrap_StrokeVertex_attribute(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_curvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_curvilinearAbscissa(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_strokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_strokeLength(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_u(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_SetX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_SetY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_SetPoint__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_SetPoint__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetPoint(PyObject *self, PyObject *args) {
+ PyObject *_wrap_StrokeVertex_SetPoint(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetAttribute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_SetAttribute(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetCurvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_SetCurvilinearAbscissa(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertex_SetStrokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertex_SetStrokeLength(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
index f6a4a26a65c..41d01d4b649 100644
--- a/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/SVertex.cpp
@@ -1,268 +1,268 @@
-SWIGINTERN PyObject *_wrap_SVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getPoint3D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getProjectedX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getProjectedY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getProjectedZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getPoint2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getFEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_castToSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_castToViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_castToNonTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_castToTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_userdata_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_userdata_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SVertex__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_SVertex__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SVertex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_SVertex__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SVertex__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_SVertex__SWIG_2(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SVertex(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_SVertex(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_SVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_SVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_dupplicate(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex___eq__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_point3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_point3D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_point2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_point2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_normals(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_normals(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_normalsSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_normalsSize(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_fedges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_fedges(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_fedges_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_fedges_begin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_fedges_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_fedges_end(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_shape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_shape__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_z(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_z(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_viewvertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_viewvertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_SetPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_SetPoint3D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_SetPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_SetPoint2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_AddNormal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_AddNormal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_setCurvatureInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_setCurvatureInfo(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_getCurvatureInfo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_getCurvatureInfo(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_setCurvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_setCurvatureFredo(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_setDirectionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_setDirectionFredo(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_curvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_curvatureFredo(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_directionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_directionFredo(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_SetId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_SetFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_SetFEdges(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_SetShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_SetViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_SetViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_AddFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_AddFEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_Replace(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_fedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_fedge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_point2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_point2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_point3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_point3d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_normal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_shape_id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_shape_id(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_shape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_shape__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_shape(PyObject *self, PyObject *args) {
+ PyObject *_wrap_SVertex_shape(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_shape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_shape_importance(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_qi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_qi(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_occluders_begin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_occluders_end(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_occluders_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_occluders_size(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_occludee(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_occluded_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_occludee_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SVertex_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SVertex_z_discontinuity(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
index 2b3e733e605..293f42949e3 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
@@ -1,76 +1,76 @@
-SWIGINTERN PyObject *_wrap_ViewVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_userdata_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_userdata_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_getNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_setNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_setNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_Replace(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_edges_begin__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_edges_begin__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edges_begin(PyObject *self, PyObject *args) {
+ PyObject *_wrap_ViewVertex_edges_begin(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_edges_end__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_edges_end__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edges_end(PyObject *self, PyObject *args) {
+ PyObject *_wrap_ViewVertex_edges_end(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_edges_iterator__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_edges_iterator__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edges_iterator(PyObject *self, PyObject *args) {
+ PyObject *_wrap_ViewVertex_edges_iterator(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edgesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_edgesBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edgesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_edgesEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewVertex_edgesIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewVertex_edgesIterator(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp
index d287ddf0c72..772a385139e 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/NonTVertex.cpp
@@ -1,132 +1,132 @@
-SWIGINTERN PyObject *_wrap_NonTVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getPoint3D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getProjectedX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getProjectedY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getProjectedZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getPoint2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_castToSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_castToViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_castToNonTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_NonTVertex__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_NonTVertex__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_NonTVertex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_NonTVertex__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_NonTVertex(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_NonTVertex(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_NonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_NonTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_svertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_svertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_viewedges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_viewedges(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_SetSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_SetSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_SetViewEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_SetViewEdges(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_AddIncomingViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_AddIncomingViewEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_AddOutgoingViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_AddOutgoingViewEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_AddViewEdge__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_AddViewEdge__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_AddViewEdge__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_AddViewEdge__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_AddViewEdge(PyObject *self, PyObject *args) {
+ PyObject *_wrap_NonTVertex_AddViewEdge(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_Replace(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_edges_end__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_edges_end__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_edges_end(PyObject *self, PyObject *args) {
+ PyObject *_wrap_NonTVertex_edges_end(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_edgesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_edgesBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_edgesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_edgesEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_NonTVertex_edgesIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_NonTVertex_edgesIterator(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp
index 32e7ccd0ff8..715170c1422 100644
--- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex/TVertex.cpp
@@ -1,184 +1,184 @@
-SWIGINTERN PyObject *_wrap_TVertex_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getPoint3D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getProjectedX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getProjectedY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getProjectedZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getPoint2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_castToViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_castToTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_TVertex__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_TVertex__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_TVertex__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_TVertex__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_TVertex(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_TVertex(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_frontSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_frontSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_backSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_backSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_frontEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_frontEdgeA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_frontEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_frontEdgeB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_backEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_backEdgeA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_backEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_backEdgeB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetFrontVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetBackSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetFrontEdgeA__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetFrontEdgeA__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeA(PyObject *self, PyObject *args) {
+ PyObject *_wrap_TVertex_SetFrontEdgeA(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetFrontEdgeB__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetFrontEdgeB__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetFrontEdgeB(PyObject *self, PyObject *args) {
+ PyObject *_wrap_TVertex_SetFrontEdgeB(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetBackEdgeA__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetBackEdgeA__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeA(PyObject *self, PyObject *args) {
+ PyObject *_wrap_TVertex_SetBackEdgeA(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetBackEdgeB__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetBackEdgeB__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetBackEdgeB(PyObject *self, PyObject *args) {
+ PyObject *_wrap_TVertex_SetBackEdgeB(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_SetId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_GetSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_GetSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_Replace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_Replace(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_mate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_mate(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_edges_end__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_edges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_edges_end__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_edges_end(PyObject *self, PyObject *args) {
+ PyObject *_wrap_TVertex_edges_end(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_edgesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_edgesBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_edgesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_edgesEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TVertex_edgesIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TVertex_edgesIterator(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_TVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_TVertex(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Interface0DIterator.cpp
index 283dd48ce20..48b7560acea 100644
--- a/source/blender/freestyle/intern/python/Interface0DIterator.cpp
+++ b/source/blender/freestyle/intern/python/Interface0DIterator.cpp
@@ -1,104 +1,104 @@
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getObject(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator___deref__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator___deref__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_increment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_increment(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_decrement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_decrement(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_isBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_isBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_isEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_isEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator___eq__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator___ne__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_t(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_u(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getPoint3D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getProjectedX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getProjectedY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getProjectedZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getPoint2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getFEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_getNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_castToSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_castToViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_castToNonTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Interface0DIterator_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Interface0DIterator_castToTVertex(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface1D.cpp b/source/blender/freestyle/intern/python/Interface1D.cpp
index 0bbb6049d74..65641c6c8ff 100644
--- a/source/blender/freestyle/intern/python/Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D.cpp
@@ -1,56 +1,171 @@
-SWIGINTERN PyObject *_wrap_Interface1D_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+#include "Interface1D.h"
+
+#include "Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+
+/*-----------------------Python API function prototypes for the Interface1D module--*/
+//static PyObject *Freestyle_testOutput( BPy_Freestyle * self );
+/*-----------------------Interface1D module doc strings-----------------------------*/
+static char M_Interface1D_doc[] = "The Blender.Freestyle.Interface1D submodule";
+/*----------------------Interface1D module method def----------------------------*/
+struct PyMethodDef M_Interface1D_methods[] = {
+//	{"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Freestyle method def------------------------------*/
+
+PyTypeObject Interface1D_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Interface1D",				/* tp_name */
+	sizeof( BPy_Interface1D ),	/* 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, 		/* 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 ***/
+	NULL,						/* struct PyMethodDef *tp_methods; */
+	NULL,                       /* struct PyMemberDef *tp_members; */
+	NULL,         				/* struct PyGetSetDef *tp_getset; */
+	NULL,                       /* struct _typeobject *tp_base; */
+	NULL,                       /* PyObject *tp_dict; */
+	NULL,                       /* descrgetfunc tp_descr_get; */
+	NULL,                       /* descrsetfunc tp_descr_set; */
+	0,                          /* long tp_dictoffset; */
+	NULL,                       /* 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--------------------------------
+PyObject *Interface1D_Init( void )
+{
+	PyObject *submodule;
+	
+	if( PyType_Ready( &Interface1D_Type ) < 0 )
+		return NULL;
+	
+	submodule = Py_InitModule3( "Blender.Freestyle.Interface1D", M_Interface1D_methods, M_Interface1D_doc );
+	
+	return submodule;
 }
 
-
-SWIGINTERN PyObject *_wrap_Interface1D_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Interface1D_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Interface1D_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Interface1D_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
+//------------------------INSTANCE METHODS ----------------------------------
 
 
-SWIGINTERN PyObject *_wrap_Interface1D_pointsBegin(PyObject *self, PyObject *args) {
+PyObject *Interface1D_getExactTypeName( BPy_Interface1D *self ) {
+	return PyString_FromString( self->if1D->getExactTypeName().c_str() );	
 }
 
-
-SWIGINTERN PyObject *_wrap_Interface1D_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface1D_getVertices( BPy_Interface1D *self ) {
+	// Vector
 }
 
-
-SWIGINTERN PyObject *_wrap_Interface1D_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface1D_getPoints( BPy_Interface1D *self ) {
+	// Vector
 }
 
-
-SWIGINTERN PyObject *_wrap_Interface1D_pointsEnd(PyObject *self, PyObject *args) {
+PyObject *Interface1D_getLength2D( BPy_Interface1D *self ) {
+	return PyFloat_FromDouble( (double) self->if1D->getLength2D() );
 }
 
-
-SWIGINTERN PyObject *_wrap_Interface1D_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface1D_getId( BPy_Interface1D *self ) {
+	// Id
 }
 
-
-SWIGINTERN PyObject *_wrap_Interface1D_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface1D_getNature( BPy_Interface1D *self ) {
+	// EdgeNature
 }
 
-
-SWIGINTERN PyObject *_wrap_Interface1D_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface1D_getTimeStamp( BPy_Interface1D *self ) {
+	return PyInt_FromLong( self->if1D->getTimeStamp() );
 }
 
-
-SWIGINTERN PyObject *_wrap_Interface1D_getTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Interface1D_setTimeStamp( BPy_Interface1D *self, PyObject *args) {
+	PyObject * obj1 = 0 ;
+	PyObject * obj2 = 0 ;
+	unsigned int timestamp;
+	
+	if( !PyArg_ParseTuple(args, (char *)"OO:Interface1D_setTimeStamp", &obj1, &obj2) )
+		cout << "ERROR: Interface1D_setTimeStamp" << endl;
+	
+	timestamp = static_cast<unsigned int>( PyInt_AsLong(obj2) );
+	self->if1D->setTimeStamp( timestamp );
+
+	Py_RETURN_NONE;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
-SWIGINTERN PyObject *_wrap_Interface1D_setTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+#ifdef __cplusplus
 }
+#endif
 
 
diff --git a/source/blender/freestyle/intern/python/Interface1D.h b/source/blender/freestyle/intern/python/Interface1D.h
new file mode 100644
index 00000000000..7477d368372
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface1D.h
@@ -0,0 +1,36 @@
+#ifndef FREESTYLE_PYTHON_INTERFACE1D_H
+#define FREESTYLE_PYTHON_INTERFACE1D_H
+
+#include "../view_map/Interface1D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Interface1D_Type;
+
+#define BPy_Interface1D_Check(v) \
+    ((v)->ob_type == &Interface1D_Type)
+
+/*---------------------------Python BPy_Interface1D structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	Interface1D *if1D;
+} BPy_Interface1D;
+
+/*---------------------------Python BPy_Interface1D visible prototypes-----------*/
+
+PyObject *Interface1D_Init( void );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_INTERFACE1D_H */
diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve.cpp b/source/blender/freestyle/intern/python/Interface1D/Curve.cpp
index 758227e6ad9..4fac75b3f0d 100644
--- a/source/blender/freestyle/intern/python/Interface1D/Curve.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/Curve.cpp
@@ -1,112 +1,112 @@
-SWIGINTERN PyObject *_wrap_Curve_computeCurvatureAndOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_computeCurvatureAndOrientation(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_push_vertex_back__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_push_vertex_back__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_push_vertex_back__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_push_vertex_back__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_push_vertex_back(PyObject *self, PyObject *args) {
+ PyObject *_wrap_Curve_push_vertex_back(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_push_vertex_front__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_push_vertex_front__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_push_vertex_front__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_push_vertex_front__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_push_vertex_front(PyObject *self, PyObject *args) {
+ PyObject *_wrap_Curve_push_vertex_front(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_getLength2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_nSegments(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_nSegments(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_setId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_setId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_curvePointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_curvePointsBegin__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_curvePointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_curvePointsBegin__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_curvePointsBegin(PyObject *self, PyObject *args) {
+ PyObject *_wrap_Curve_curvePointsBegin(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_curvePointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_curvePointsEnd__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_curvePointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_curvePointsEnd__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_curvePointsEnd(PyObject *self, PyObject *args) {
+ PyObject *_wrap_Curve_curvePointsEnd(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_curveVerticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_curveVerticesBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_curveVerticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_curveVerticesEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_verticesBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_verticesEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_pointsBegin__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_pointsBegin__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_pointsBegin(PyObject *self, PyObject *args) {
+ PyObject *_wrap_Curve_pointsBegin(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_pointsEnd__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curve_pointsEnd__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curve_pointsEnd(PyObject *self, PyObject *args) {
+ PyObject *_wrap_Curve_pointsEnd(PyObject *self, PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
index 4985a2d00a4..862456d2b7c 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge.cpp
@@ -1,252 +1,252 @@
-SWIGINTERN PyObject *_wrap_FEdge_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_getLength2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_userdata_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_userdata_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FEdge__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_FEdge__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FEdge__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_FEdge__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FEdge__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_FEdge__SWIG_2(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_FEdge(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_FEdge(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_FEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_dupplicate(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_vertexA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_vertexA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_vertexB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_vertexB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_getNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_nextEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_nextEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_previousEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_previousEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_shape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_shape__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_invisibility(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_invisibility(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_viewedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_viewedge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_center3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_center3d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_center2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_center2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_aFace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_aFace(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_getOccludeeIntersection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_getOccludeeIntersection(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_getOccludeeEmpty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_getOccludeeEmpty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_isSmooth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_isSmooth(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetVertexA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetVertexA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetVertexB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetVertexB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetNextEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetNextEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetPreviousEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetPreviousEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetViewEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetaFace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetaFace(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetOccludeeIntersection(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetOccludeeIntersection(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetOccludeeEmpty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetOccludeeEmpty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_SetSmooth(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_SetSmooth(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_CommonVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_CommonVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_min2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_min2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_max2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_max2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_shape_id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_shape_id(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_shape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_shape__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_shape(PyObject *self, PyObject *args) {
+ PyObject *_wrap_FEdge_shape(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_shape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_shape_importance(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_qi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_qi(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_occluders_begin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_occluders_end(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_occluders_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_occluders_size(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_occludee(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_occluded_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_occludee_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_z_discontinuity(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_viewedge_nature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_viewedge_nature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_orientation2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_orientation2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_orientation3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_orientation3d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_verticesBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_verticesEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_pointsBegin__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_pointsBegin__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_pointsBegin(PyObject *self, PyObject *args) {
+ PyObject *_wrap_FEdge_pointsBegin(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_pointsEnd__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdge_pointsEnd__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdge_pointsEnd(PyObject *self, PyObject *args) {
+ PyObject *_wrap_FEdge_pointsEnd(PyObject *self, PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp
index 70a01ad4176..d6bd8c6f085 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSharp.cpp
@@ -1,44 +1,44 @@
-SWIGINTERN PyObject *_wrap_FEdgeSharp_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_dupplicate(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_normalA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_normalA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_normalB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_normalB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_aMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_aMaterialIndex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_aMaterial(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_aMaterial(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_bMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_bMaterialIndex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_bMaterial(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_bMaterial(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_SetNormalA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_SetNormalA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_SetNormalB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_SetNormalB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_SetaMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_SetaMaterialIndex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSharp_SetbMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSharp_SetbMaterialIndex(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp
index 9c478f24839..e453bbdc863 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/FEdgeSmooth.cpp
@@ -1,32 +1,32 @@
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSmooth_dupplicate(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_face(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSmooth_face(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSmooth_normal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_materialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSmooth_materialIndex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_material(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSmooth_material(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_SetFace(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSmooth_SetFace(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_SetNormal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSmooth_SetNormal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FEdgeSmooth_SetMaterialIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FEdgeSmooth_SetMaterialIndex(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
index c86c2eafac9..fe5feb7068b 100644
--- a/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/Stroke.cpp
@@ -1,236 +1,236 @@
-SWIGINTERN PyObject *_wrap_Stroke_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Stroke__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_Stroke__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Stroke__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_Stroke__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Stroke(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_Stroke(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Stroke(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_Stroke(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_ComputeSampling(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_ComputeSampling(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_Resample__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_Resample__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_Resample__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_Resample__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_Resample(PyObject *self, PyObject *args) {
+PyObject *Stroke_Resample(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_RemoveVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_RemoveVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_InsertVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_InsertVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_Render(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_Render(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_RenderBasic(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_RenderBasic(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getLength2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getMediumType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getMediumType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getTextureId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getTextureId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_hasTips(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_hasTips(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_vertices_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_vertices_size(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_viewedges_begin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_viewedges_begin__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_viewedges_begin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_viewedges_begin__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_viewedges_begin(PyObject *self, PyObject *args) {
+PyObject *Stroke_viewedges_begin(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_viewedges_end__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_viewedges_end__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_viewedges_end__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_viewedges_end__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_viewedges_end(PyObject *self, PyObject *args) {
+PyObject *Stroke_viewedges_end(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_viewedges_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_viewedges_size(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getBeginningOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getBeginningOrientation(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getBeginningOrientationX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getBeginningOrientationX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getBeginningOrientationY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getBeginningOrientationY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getEndingOrientation(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getEndingOrientation(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getEndingOrientationX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getEndingOrientationX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_getEndingOrientationY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_getEndingOrientationY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_SetId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_SetLength(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetMediumType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_SetMediumType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetTextureId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_SetTextureId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetTips(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_SetTips(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_push_back(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_push_back(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_push_front(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_push_front(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_AddViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_AddViewEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_SetBeginningOrientation__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_SetBeginningOrientation__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetBeginningOrientation(PyObject *self, PyObject *args) {
+PyObject *Stroke_SetBeginningOrientation(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_SetEndingOrientation__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_SetEndingOrientation__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_SetEndingOrientation(PyObject *self, PyObject *args) {
+PyObject *Stroke_SetEndingOrientation(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_strokeVerticesBegin__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_strokeVerticesBegin__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesBegin(PyObject *self, PyObject *args) {
+PyObject *Stroke_strokeVerticesBegin(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_strokeVerticesEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_strokeVerticesSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_strokeVerticesSize(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_verticesBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_verticesEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_pointsBegin__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_pointsBegin__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_pointsBegin(PyObject *self, PyObject *args) {
+PyObject *Stroke_pointsBegin(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_pointsEnd__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Stroke_pointsEnd__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Stroke_pointsEnd(PyObject *self, PyObject *args) {
+PyObject *Stroke_pointsEnd(PyObject *self, PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp
index d9db8ea83c4..1b55b601c89 100644
--- a/source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/ViewEdge.cpp
@@ -1,236 +1,236 @@
-SWIGINTERN PyObject *_wrap_ViewEdge_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_getNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_userdata_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_userdata_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewEdge__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ViewEdge__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewEdge__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ViewEdge__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewEdge__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ViewEdge__SWIG_2(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewEdge__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ViewEdge__SWIG_3(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewEdge(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_ViewEdge(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ViewEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_A(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_B(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_B(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_fedgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_fedgeA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_fedgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_fedgeB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_viewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_viewShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_aShape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_aShape__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_isClosed(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_isClosed(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_getChainingTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_getChainingTimeStamp(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_aShape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_aShape__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_aShape(PyObject *self, PyObject *args) {
+ PyObject *_wrap_ViewEdge_aShape(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_bShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_bShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_occluders(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_occluders(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_splittingId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_splittingId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_SetA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_SetB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_SetNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetFEdgeA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_SetFEdgeA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetFEdgeB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_SetFEdgeB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_SetShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_SetId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_UpdateFEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_UpdateFEdges(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetaShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_SetaShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_SetQI(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_SetQI(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_setChainingTimeStamp(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_setChainingTimeStamp(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_AddOccluder(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_AddOccluder(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_setSplittingId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_setSplittingId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_intersect_2d_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_intersect_2d_area(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_include_in_2d_area(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_include_in_2d_area(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_getLength2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_getLength2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_qi(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_qi(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_occluders_begin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_occluders_end(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_occluders_size(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_occluders_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_occludee(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_occluded_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_occludee_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_shape_id(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_shape_id(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_shape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_shape_importance(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_verticesBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_verticesBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_verticesEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_verticesEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_pointsBegin__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_pointsBegin__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_pointsBegin__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_pointsBegin__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_pointsBegin(PyObject *self, PyObject *args) {
+ PyObject *_wrap_ViewEdge_pointsBegin(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_pointsEnd__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_pointsEnd__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_pointsEnd__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewEdge_pointsEnd__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewEdge_pointsEnd(PyObject *self, PyObject *args) {
+ PyObject *_wrap_ViewEdge_pointsEnd(PyObject *self, PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Material.cpp b/source/blender/freestyle/intern/python/Material.cpp
index 217e2d7e89c..459de449336 100644
--- a/source/blender/freestyle/intern/python/Material.cpp
+++ b/source/blender/freestyle/intern/python/Material.cpp
@@ -1,112 +1,112 @@
-SWIGINTERN PyObject *_wrap_Material_diffuse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_diffuse(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_diffuseR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_diffuseR(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_diffuseG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_diffuseG(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_diffuseB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_diffuseB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_diffuseA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_diffuseA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_specular(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_specular(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_specularR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_specularR(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_specularG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_specularG(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_specularB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_specularB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_specularA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_specularA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_ambient(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_ambient(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_ambientR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_ambientR(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_ambientG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_ambientG(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_ambientB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_ambientB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_ambientA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_ambientA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_emission(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_emission(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_emissionR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_emissionR(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_emissionG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_emissionG(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_emissionB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_emissionB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_emissionA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_emissionA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_shininess(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_shininess(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_SetDiffuse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_SetDiffuse(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_SetSpecular(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_SetSpecular(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_SetAmbient(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_SetAmbient(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_SetEmission(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_SetEmission(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material_SetShininess(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material_SetShininess(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material___ne__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material___ne__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Material___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Material___eq__(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Noise.cpp b/source/blender/freestyle/intern/python/Noise.cpp
index e64393d9b35..8e6b7aa5022 100644
--- a/source/blender/freestyle/intern/python/Noise.cpp
+++ b/source/blender/freestyle/intern/python/Noise.cpp
@@ -1,48 +1,48 @@
-SWIGINTERN PyObject *_wrap_Noise_turbulence1__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Noise_turbulence1__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_turbulence1__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Noise_turbulence1__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_turbulence1(PyObject *self, PyObject *args) {
+ PyObject *_wrap_Noise_turbulence1(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_turbulence2__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Noise_turbulence2__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_turbulence2__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Noise_turbulence2__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_turbulence2(PyObject *self, PyObject *args) {
+ PyObject *_wrap_Noise_turbulence2(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_turbulence3__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Noise_turbulence3__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_turbulence3__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Noise_turbulence3__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_turbulence3(PyObject *self, PyObject *args) {
+ PyObject *_wrap_Noise_turbulence3(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_smoothNoise1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Noise_smoothNoise1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_smoothNoise2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Noise_smoothNoise2(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Noise_smoothNoise3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Noise_smoothNoise3(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/Operators.cpp b/source/blender/freestyle/intern/python/Operators.cpp
index df9fa4571aa..efae258d5ee 100644
--- a/source/blender/freestyle/intern/python/Operators.cpp
+++ b/source/blender/freestyle/intern/python/Operators.cpp
@@ -1,104 +1,57 @@
-SWIGINTERN PyObject *_wrap_Operators_select(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_select(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_chain__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_chain(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_chain__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_bidirectionalChain(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_chain(PyObject *self, PyObject *args) {
+PyObject *Operators_sequentialSplit(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_bidirectionalChain__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_recursiveSplit(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_bidirectionalChain__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_sort(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_bidirectionalChain(PyObject *self, PyObject *args) {
+PyObject *Operators_create(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_sequentialSplit__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_sequentialSplit__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_sequentialSplit__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_sequentialSplit__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_sequentialSplit(PyObject *self, PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_recursiveSplit__SWIG_3(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_recursiveSplit(PyObject *self, PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_sort(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
-
-SWIGINTERN PyObject *_wrap_Operators_create(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
-}
-
+PyObject *Operators_getViewEdgeFromIndex(PyObject *self , PyObject *args) {
 
-SWIGINTERN PyObject *_wrap_Operators_getViewEdgeFromIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_getChainFromIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_getChainFromIndex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_getStrokeFromIndex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_getStrokeFromIndex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_getViewEdgesSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_getViewEdgesSize(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_getChainsSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_getChainsSize(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Operators_getStrokesSize(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+PyObject *Operators_getStrokesSize(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Operators(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *delete_Operators(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/SShape.cpp b/source/blender/freestyle/intern/python/SShape.cpp
index 201fba6ed9d..a5b1cf3f27a 100644
--- a/source/blender/freestyle/intern/python/SShape.cpp
+++ b/source/blender/freestyle/intern/python/SShape.cpp
@@ -1,120 +1,120 @@
-SWIGINTERN PyObject *_wrap_SShape_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_userdata_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_userdata_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SShape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_SShape__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SShape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_SShape__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_SShape(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_SShape(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_dupplicate(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_SShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_SShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_AddEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_AddEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_AddNewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_AddNewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_AddChain(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_AddChain(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_CreateSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_CreateSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_SplitEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_SplitEdgeIn2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_SplitEdgeIn2(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_SetBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_SetBBox(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_ComputeBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_ComputeBBox(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_RemoveEdgeFromChain(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_RemoveEdgeFromChain(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_RemoveEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_RemoveEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_GetVertexList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_GetVertexList(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_GetEdgeList(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_GetEdgeList(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_GetChains(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_GetChains(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_bbox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_bbox(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_material(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_material(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_materials(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_materials(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_viewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_viewShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_importance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_importance(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_SetId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_SetId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_SetMaterials(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_SetMaterials(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_SetViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_SetViewShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_SShape_SetImportance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SShape_SetImportance(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeAttribute.cpp b/source/blender/freestyle/intern/python/StrokeAttribute.cpp
index c38da608c2d..c54eca16e11 100644
--- a/source/blender/freestyle/intern/python/StrokeAttribute.cpp
+++ b/source/blender/freestyle/intern/python/StrokeAttribute.cpp
@@ -1,112 +1,112 @@
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getColor(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getColor(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getColorR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getColorR(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getColorG(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getColorG(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getColorB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getColorB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getColorRGB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getColorRGB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getAlpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getAlpha(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getThickness(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getThickness(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getThicknessR(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getThicknessR(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getThicknessL(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getThicknessL(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getThicknessRL(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getThicknessRL(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_isVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_isVisible(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getAttributeReal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getAttributeReal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getAttributeVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getAttributeVec2f(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_getAttributeVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_getAttributeVec3f(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_isAttributeAvailableReal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_isAttributeAvailableReal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_isAttributeAvailableVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_isAttributeAvailableVec2f(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_isAttributeAvailableVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_isAttributeAvailableVec3f(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setColor__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setColor__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setColor(PyObject *self, PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setColor(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setAlpha(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setAlpha(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setThickness__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setThickness__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setThickness(PyObject *self, PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setThickness(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_SetVisible(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_SetVisible(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setAttributeReal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setAttributeReal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setAttributeVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setAttributeVec2f(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeAttribute_setAttributeVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeAttribute_setAttributeVec3f(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader.cpp b/source/blender/freestyle/intern/python/StrokeShader.cpp
index 6348b654003..268d1fabe36 100644
--- a/source/blender/freestyle/intern/python/StrokeShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_StrokeShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeShader_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_StrokeShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_StrokeShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp
index 68ea395d7b9..96fd31e982e 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BackboneStretcherShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_BackboneStretcherShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_BackboneStretcherShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_BackboneStretcherShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_BackboneStretcherShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp
index bf480135451..a4d476bb2d6 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/BezierCurveShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_BezierCurveShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_BezierCurveShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_BezierCurveShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_BezierCurveShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp
index cf7caa68326..2f7a422d311 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/CalligraphicShader.cpp
@@ -1,4 +1,4 @@
-SWIGINTERN PyObject *_wrap_CalligraphicShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CalligraphicShader_shade(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp
index 34f21261c33..1b52e33fd8f 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ColorNoiseShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_ColorNoiseShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ColorNoiseShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ColorNoiseShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ColorNoiseShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp
index 4d97fbf6c3c..7529c869939 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ColorVariationPatternShader.cpp
@@ -1,4 +1,4 @@
-SWIGINTERN PyObject *_wrap_ColorVariationPatternShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ColorVariationPatternShader_shade(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp
index e1a58326696..e636331c57c 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ConstantColorShader.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_ConstantColorShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ConstantColorShader_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ConstantColorShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ConstantColorShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ConstantColorShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ConstantColorShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp
index 3d6950d556e..1840ef71f6d 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ConstantThicknessShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_ConstantThicknessShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ConstantThicknessShader_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ConstantThicknessShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ConstantThicknessShader_shade(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp
index a0e0a4ace8c..41eb1c94d17 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ConstrainedIncreasingThicknessShader.cpp
@@ -1,4 +1,4 @@
-SWIGINTERN PyObject *_wrap_ConstrainedIncreasingThicknessShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ConstrainedIncreasingThicknessShader_shade(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp
index fdd198a30af..633523af330 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/GuidingLinesShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_GuidingLinesShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GuidingLinesShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GuidingLinesShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GuidingLinesShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp
index bfac8efda55..2fbb74f3768 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/IncreasingColorShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_IncreasingColorShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_IncreasingColorShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_IncreasingColorShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_IncreasingColorShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp
index e17f06dfafb..4d97f43841d 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/IncreasingThicknessShader.cpp
@@ -1,4 +1,4 @@
-SWIGINTERN PyObject *_wrap_IncreasingThicknessShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_IncreasingThicknessShader_shade(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp
index 533d481165f..098330d37bd 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/PolygonalizationShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_PolygonalizationShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_PolygonalizationShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_PolygonalizationShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_PolygonalizationShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp
index 698905ad292..3a42bda3b08 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/SamplingShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_SamplingShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SamplingShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_SamplingShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_SamplingShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp
index 68a41f48160..ff90e7f973c 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/SpatialNoiseShader.cpp
@@ -1,4 +1,4 @@
-SWIGINTERN PyObject *_wrap_SpatialNoiseShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_SpatialNoiseShader_shade(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp
index 317273262ae..90636eb5aee 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/StrokeTextureShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_StrokeTextureShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeTextureShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_StrokeTextureShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_StrokeTextureShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp
index 4bb2f6bf03a..9a308d60ac3 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/TextureAssignerShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_TextureAssignerShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TextureAssignerShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_TextureAssignerShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_TextureAssignerShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp
index a0542e8d400..0c69aa5cfc1 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ThicknessNoiseShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_ThicknessNoiseShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ThicknessNoiseShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ThicknessNoiseShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ThicknessNoiseShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp
index 992d526e728..02326259be8 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/ThicknessVariationPatternShader.cpp
@@ -1,4 +1,4 @@
-SWIGINTERN PyObject *_wrap_ThicknessVariationPatternShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ThicknessVariationPatternShader_shade(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp
index 883cd4c0ded..4a202ddd6ee 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/TipRemoverShader.cpp
@@ -1,4 +1,4 @@
-SWIGINTERN PyObject *_wrap_TipRemoverShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TipRemoverShader_shade(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp
index 275c7277ce4..dc19cde3871 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/fstreamShader.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_fstreamShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_fstreamShader_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_fstreamShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_fstreamShader_shade(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp
index 4f36bfae337..aa3250f858c 100644
--- a/source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp
+++ b/source/blender/freestyle/intern/python/StrokeShader/streamShader.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_streamShader_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_streamShader_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_streamShader_shade(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_streamShader_shade(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_streamShader(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_streamShader(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/StrokeVertexIterator.cpp
index 7997a73e28c..3fae5a34060 100644
--- a/source/blender/freestyle/intern/python/StrokeVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/StrokeVertexIterator.cpp
@@ -1,260 +1,260 @@
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToInterface0DIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_castToInterface0DIterator(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getObject(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getObject(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator___deref__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator___deref__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_increment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_increment(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_decrement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_decrement(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_isBegin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_isBegin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_isEnd(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_isEnd(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator___eq__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator___eq__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_t(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_t(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_u(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_u(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_copy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_copy(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getIt(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getIt(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_x(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_x(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_y(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_y(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getPoint(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_attribute__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_attribute__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_attribute__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_attribute__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_attribute(PyObject *self, PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_attribute(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_curvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_curvilinearAbscissa(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_strokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_strokeLength(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetPoint__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetPoint__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetPoint(PyObject *self, PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetPoint(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetAttribute(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetAttribute(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetCurvilinearAbscissa(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetCurvilinearAbscissa(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetStrokeLength(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetStrokeLength(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint3D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getPoint3D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getProjectedX(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getProjectedX(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getProjectedY(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getProjectedY(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getProjectedZ(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getProjectedZ(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getPoint2D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getPoint2D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getFEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_getNature(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_getNature(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_castToSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_castToViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToNonTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_castToNonTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_castToTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_castToTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_A(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_A(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_B(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_B(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_t2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_t2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetA(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetA(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetB(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetB(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_SetT2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_SetT2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_fedge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_fedge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_point2d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_point2d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_point3d(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_point3d(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_normal(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_normal(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluders_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_occluders_begin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluders_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_occluders_end(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluders_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_occluders_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluders_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_occluders_size(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occludee(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_occludee(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occluded_shape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_occluded_shape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_occludee_empty(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_occludee_empty(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_z_discontinuity(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_z_discontinuity(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_curvatureFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_curvatureFredo(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_StrokeVertexIterator_directionFredo(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_StrokeVertexIterator_directionFredo(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DDouble.cpp
index a6ec72c8c19..df286794dd3 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DDouble.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DDouble.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DDouble_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction0DDouble___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DDouble___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction0DDouble(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DFloat.cpp
index 3a4b0326cf7..ccb89d91ecf 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DFloat.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DFloat.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DFloat_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction0DFloat___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DFloat___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction0DFloat(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DId.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DId.cpp
index 8388d964479..b854b3ccaa4 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DId.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DId.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction0DId_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DId_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction0DId___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DId___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction0DId(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DUnsigned.cpp
index 9d2491bee33..425d1cdabf5 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DUnsigned.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DUnsigned.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DUnsigned_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction0DUnsigned___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DUnsigned___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction0DUnsigned(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec2f.cpp
index 36a7772ab72..828d39b6de7 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec2f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec2f.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DVec2f_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction0DVec2f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DVec2f___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction0DVec2f(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec3f.cpp
index 5996de16ac1..b6a6d0264bc 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec3f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVec3f.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DVec3f_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction0DVec3f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DVec3f___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction0DVec3f(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVectorViewShape.cpp
index 0552b54aed8..f9736680ab8 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVectorViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DVectorViewShape.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DVectorViewShape_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction0DVectorViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DVectorViewShape___call__(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DViewShape.cpp
index a8af361cc63..3dddb333a55 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0DViewShape.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction0DViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DViewShape_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction0DViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DViewShape___call__(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp
index bed3db84681..58fa20b8e95 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/ShapeIdF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_ShapeIdF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ShapeIdF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ShapeIdF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ShapeIdF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ShapeIdF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ShapeIdF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ShapeIdF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ShapeIdF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp
index d12d4b6383d..167a68b8977 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/MaterialF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_MaterialF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_MaterialF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_MaterialF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_MaterialF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_MaterialF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_MaterialF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_MaterialF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_MaterialF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp
index 814c89c1766..1b155757589 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/CurveNatureF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_CurveNatureF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurveNatureF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurveNatureF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurveNatureF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_CurveNatureF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_CurveNatureF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_CurveNatureF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_CurveNatureF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp
index 64ee307e011..99f892529ab 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/Normal2DF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_Normal2DF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Normal2DF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Normal2DF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Normal2DF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Normal2DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_Normal2DF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Normal2DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_Normal2DF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp
index 6611a23e41c..bf7fbfe2550 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/VertexOrientation2DF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_VertexOrientation2DF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_VertexOrientation2DF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_VertexOrientation2DF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_VertexOrientation2DF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_VertexOrientation2DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_VertexOrientation2DF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_VertexOrientation2DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_VertexOrientation2DF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp
index 24dabfcdc66..32d5ac529fa 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/VertexOrientation3DF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_VertexOrientation3DF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_VertexOrientation3DF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_VertexOrientation3DF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_VertexOrientation3DF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_VertexOrientation3DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_VertexOrientation3DF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_VertexOrientation3DF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_VertexOrientation3DF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp
index 9029b9ea863..2dc779a3fdb 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetOccludeeF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetOccludeeF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetOccludeeF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetOccludeeF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetOccludeeF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetOccludeeF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetOccludeeF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetOccludeeF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetOccludeeF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp
index 6e9d3abde41..92ec79efec5 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/GetShapeF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetShapeF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetShapeF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetShapeF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetShapeF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetShapeF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetShapeF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetShapeF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetShapeF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/DensityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/DensityF0D.cpp
new file mode 100644
index 00000000000..50986360f2c
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/DensityF0D.cpp
@@ -0,0 +1,12 @@
+ PyObject *_wrap_DensityF0D_getName(PyObject *self , PyObject *args) {
+}
+
+
+ PyObject *_wrap_DensityF0D___call__(PyObject *self , PyObject *args) {
+}
+
+
+ PyObject *_wrap_delete_DensityF0D(PyObject *self , PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/LocalAverageDepthF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/LocalAverageDepthF0D.cpp
new file mode 100644
index 00000000000..0738f2cf6dc
--- /dev/null
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/LocalAverageDepthF0D.cpp
@@ -0,0 +1,12 @@
+ PyObject *_wrap_LocalAverageDepthF0D_getName(PyObject *self , PyObject *args) {
+}
+
+
+ PyObject *_wrap_LocalAverageDepthF0D___call__(PyObject *self , PyObject *args) {
+}
+
+
+ PyObject *_wrap_delete_LocalAverageDepthF0D(PyObject *self , PyObject *args) {
+}
+
+
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp
index cf684395749..359e3186905 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetCurvilinearAbscissaF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetCurvilinearAbscissaF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetCurvilinearAbscissaF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetCurvilinearAbscissaF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetCurvilinearAbscissaF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetCurvilinearAbscissaF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetCurvilinearAbscissaF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetCurvilinearAbscissaF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetCurvilinearAbscissaF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp
index aab03185ae8..71b7ac85a7f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetParameterF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetParameterF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetParameterF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetParameterF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetParameterF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetParameterF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetParameterF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetParameterF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetParameterF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp
index 5007e5c68cd..8def0ea948f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/GetViewMapGradientNormF0D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetViewMapGradientNormF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetViewMapGradientNormF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetViewMapGradientNormF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetViewMapGradientNormF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetViewMapGradientNormF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetViewMapGradientNormF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp
index c0dc2350a00..74fdf60dffc 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadCompleteViewMapPixelF0D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_ReadCompleteViewMapPixelF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ReadCompleteViewMapPixelF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ReadCompleteViewMapPixelF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ReadCompleteViewMapPixelF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ReadCompleteViewMapPixelF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ReadCompleteViewMapPixelF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp
index 4adcced09e5..cb2bdd4c60a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadMapPixelF0D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_ReadMapPixelF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ReadMapPixelF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ReadMapPixelF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ReadMapPixelF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ReadMapPixelF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ReadMapPixelF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp
index 7c3c4c58120..dc32cf290a0 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/ReadSteerableViewMapPixelF0D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_ReadSteerableViewMapPixelF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ReadSteerableViewMapPixelF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ReadSteerableViewMapPixelF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ReadSteerableViewMapPixelF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ReadSteerableViewMapPixelF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ReadSteerableViewMapPixelF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp
index 749af7bbf8b..f91642ad7c1 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/Curvature2DAngleF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_Curvature2DAngleF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curvature2DAngleF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curvature2DAngleF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curvature2DAngleF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_Curvature2DAngleF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_Curvature2DAngleF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Curvature2DAngleF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_Curvature2DAngleF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp
index 727e617512a..f99666cdd65 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedXF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetProjectedXF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedXF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetProjectedXF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedXF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetProjectedXF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetProjectedXF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetProjectedXF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetProjectedXF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp
index c135ac5a45c..44eb1d44bf2 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedYF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetProjectedYF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedYF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetProjectedYF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedYF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetProjectedYF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetProjectedYF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetProjectedYF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetProjectedYF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp
index 928e3ce73f8..0257328973b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetProjectedZF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetProjectedZF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedZF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetProjectedZF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedZF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetProjectedZF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetProjectedZF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetProjectedZF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetProjectedZF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp
index e6286fd53fe..6bc16ad36d1 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetXF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetXF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetXF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetXF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetXF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetXF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetXF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetXF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetXF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp
index 767c21d5592..c2651fc59be 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetYF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetYF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetYF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetYF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetYF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetYF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetYF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetYF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetYF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp
index 526a321f667..e3f1f56a932 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/GetZF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetZF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetZF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetZF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetZF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetZF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetZF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetZF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetZF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp
index d043f373dd1..c72e020066a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_real/ZDiscontinuityF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_ZDiscontinuityF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ZDiscontinuityF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ZDiscontinuityF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ZDiscontinuityF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ZDiscontinuityF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ZDiscontinuityF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ZDiscontinuityF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ZDiscontinuityF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp
index edc9c97f740..15e3114b81a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/QuantitativeInvisibilityF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_QuantitativeInvisibilityF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_QuantitativeInvisibilityF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_QuantitativeInvisibilityF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_QuantitativeInvisibilityF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_QuantitativeInvisibilityF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_QuantitativeInvisibilityF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp
index 3968e1293a9..95de61007c1 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/GetOccludersF0D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_GetOccludersF0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetOccludersF0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetOccludersF0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetOccludersF0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_GetOccludersF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_GetOccludersF0D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetOccludersF0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetOccludersF0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp
index f7c7dca2535..92a87b04a80 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DVoid_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction0DVoid___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction0DVoid___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction0DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction0DVoid(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DDouble.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DDouble.cpp
index b7194d3e116..ad7c6627799 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DDouble.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DDouble.cpp
@@ -1,20 +1,20 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DDouble_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DDouble___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DDouble_setIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DDouble_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DDouble_getIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DDouble(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction1DDouble(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DFloat.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DFloat.cpp
index a41994114e4..cb572980f8f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DFloat.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DFloat.cpp
@@ -1,20 +1,20 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DFloat_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DFloat___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DFloat_setIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DFloat_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DFloat_getIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DFloat(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction1DFloat(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DUnsigned.cpp
index 2b0b96e0357..eb230a2d49f 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DUnsigned.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DUnsigned.cpp
@@ -1,20 +1,20 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DUnsigned_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DUnsigned___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DUnsigned_setIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DUnsigned_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DUnsigned_getIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DUnsigned(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction1DUnsigned(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec2f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec2f.cpp
index 546a3f66399..64fb6ef6ed7 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec2f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec2f.cpp
@@ -1,20 +1,20 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVec2f_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVec2f___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVec2f_setIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVec2f_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVec2f_getIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVec2f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction1DVec2f(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec3f.cpp
index 28b73b81b8a..d7b360eb10e 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec3f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVec3f.cpp
@@ -1,20 +1,20 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVec3f_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVec3f___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVec3f_setIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVec3f_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVec3f_getIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVec3f(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction1DVec3f(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVectorViewShape.cpp
index dafd9a65499..1fe16797593 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVectorViewShape.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1DVectorViewShape.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVectorViewShape_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVectorViewShape___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVectorViewShape_setIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVectorViewShape_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVectorViewShape_getIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp
index 37046f061b7..94d180e6cc8 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/CurveNatureF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_CurveNatureF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurveNatureF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_CurveNatureF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_CurveNatureF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_CurveNatureF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_CurveNatureF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp
index eff9b48cc02..81e5a18cb2c 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Normal2DF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_Normal2DF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Normal2DF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Normal2DF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Normal2DF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Normal2DF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_Normal2DF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp
index 20cf0d51899..2d6cfed8575 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/Orientation2DF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_Orientation2DF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Orientation2DF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Orientation2DF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Orientation2DF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Orientation2DF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_Orientation2DF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp
index bb81f96636b..f416f2ace03 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/Orientation3DF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_Orientation3DF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Orientation3DF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Orientation3DF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Orientation3DF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Orientation3DF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_Orientation3DF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp
index c8d47b2459d..861a94b7cd3 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/DensityF1D.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_DensityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_DensityF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_DensityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_DensityF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp
index dd701012a52..c8220604cb8 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetCompleteViewMapDensityF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetCompleteViewMapDensityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetCompleteViewMapDensityF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetCompleteViewMapDensityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetCompleteViewMapDensityF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetCompleteViewMapDensityF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetCompleteViewMapDensityF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp
index eb6f4944493..b7c4e40fd82 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/GetDirectionalViewMapDensityF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetDirectionalViewMapDensityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetDirectionalViewMapDensityF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetDirectionalViewMapDensityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetDirectionalViewMapDensityF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetDirectionalViewMapDensityF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetDirectionalViewMapDensityF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp
index 72de11c5fa4..6b9c687e9e0 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/LocalAverageDepthF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_LocalAverageDepthF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_LocalAverageDepthF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_LocalAverageDepthF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_LocalAverageDepthF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_LocalAverageDepthF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_LocalAverageDepthF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp
index 88d2c10e5a5..d2057990944 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/Curvature2DAngleF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_Curvature2DAngleF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curvature2DAngleF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_Curvature2DAngleF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_Curvature2DAngleF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_Curvature2DAngleF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_Curvature2DAngleF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp
index e61ee24e638..d7c8ace1bb2 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedXF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetProjectedXF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedXF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetProjectedXF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedXF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetProjectedXF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetProjectedXF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp
index 9e718a52d50..e567e07ba5a 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedYF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetProjectedYF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedYF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetProjectedYF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedYF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetProjectedYF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetProjectedYF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp
index d06dbf3e22d..b20ee1443e7 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetProjectedZF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetProjectedZF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedZF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetProjectedZF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetProjectedZF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetProjectedZF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetProjectedZF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp
index 1b86998ad8e..21df4596b5e 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetSteerableViewMapDensityF1D.cpp
@@ -1,8 +1,8 @@
-SWIGINTERN PyObject *_wrap_GetSteerableViewMapDensityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetSteerableViewMapDensityF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetSteerableViewMapDensityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetSteerableViewMapDensityF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp
index 4dc575822be..bd5425450e8 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetViewMapGradientNormF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetViewMapGradientNormF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetViewMapGradientNormF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetViewMapGradientNormF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetViewMapGradientNormF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetViewMapGradientNormF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetViewMapGradientNormF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp
index 2a1b4a368dc..73b4df64df6 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetXF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetXF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetXF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetXF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetXF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetXF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetXF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp
index c63b097d650..36a1ffed9c6 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetYF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetYF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetYF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetYF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetYF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetYF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetYF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp
index c90b2827c38..ad0fc844a1c 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/GetZF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetZF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetZF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetZF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetZF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetZF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetZF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp
index a546ba3a459..886607f7ca9 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_real/ZDiscontinuityF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_ZDiscontinuityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ZDiscontinuityF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ZDiscontinuityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ZDiscontinuityF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ZDiscontinuityF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ZDiscontinuityF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp
index af8855575b1..436b617886b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned/QuantitativeInvisibilityF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_QuantitativeInvisibilityF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_QuantitativeInvisibilityF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_QuantitativeInvisibilityF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_QuantitativeInvisibilityF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp
index 2c64c360207..7df4ea835ca 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludeeF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetOccludeeF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetOccludeeF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetOccludeeF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetOccludeeF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetOccludeeF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetOccludeeF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp
index 04031c34697..26c14fc4a81 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetOccludersF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetOccludersF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetOccludersF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetOccludersF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetOccludersF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetOccludersF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetOccludersF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp
index 839850b298e..e1fd19d5d3b 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/GetShapeF1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_GetShapeF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetShapeF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_GetShapeF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_GetShapeF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_GetShapeF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_GetShapeF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp
index db66d1526a8..daf3c773267 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/ChainingTimeStampF1D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_ChainingTimeStampF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainingTimeStampF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ChainingTimeStampF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainingTimeStampF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ChainingTimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ChainingTimeStampF1D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ChainingTimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ChainingTimeStampF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp
index 0a9052e4fab..291d180a3fe 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/IncrementChainingTimeStampF1D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_IncrementChainingTimeStampF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_IncrementChainingTimeStampF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_IncrementChainingTimeStampF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_IncrementChainingTimeStampF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_IncrementChainingTimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_IncrementChainingTimeStampF1D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_IncrementChainingTimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_IncrementChainingTimeStampF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp
index 27a6274940e..8df3b712a30 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/TimeStampF1D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_TimeStampF1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TimeStampF1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TimeStampF1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TimeStampF1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_TimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_TimeStampF1D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_TimeStampF1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_TimeStampF1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1DVoid.cpp b/source/blender/freestyle/intern/python/UnaryFunction1DVoid.cpp
index 5962613d088..13c8a088dfb 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1DVoid.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1DVoid.cpp
@@ -1,20 +1,20 @@
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVoid_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVoid___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_setIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVoid_setIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryFunction1DVoid_getIntegrationType(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryFunction1DVoid_getIntegrationType(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryFunction1DVoid(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryFunction1DVoid(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
index 0619e4d5bd0..7c67de86079 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_UnaryPredicate0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryPredicate0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryPredicate0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryPredicate0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryPredicate0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryPredicate0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp
index 5747ad1e6ea..53930660f3f 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/FalseUP0D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_FalseUP0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FalseUP0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FalseUP0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FalseUP0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FalseUP0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_FalseUP0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp
index 897ebd8ba90..776e49b5d77 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate0D/TrueUP0D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_TrueUP0D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TrueUP0D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TrueUP0D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TrueUP0D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_TrueUP0D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_TrueUP0D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
index a786c172563..0f2b5c4ad3a 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_UnaryPredicate1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryPredicate1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_UnaryPredicate1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_UnaryPredicate1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_UnaryPredicate1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_UnaryPredicate1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp
index d7a22ab9286..89ba9f3f683 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/ContourUP1D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_ContourUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ContourUP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ContourUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ContourUP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ContourUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ContourUP1D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ContourUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ContourUP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp
index dc9ec4ee5bf..664d73d59c1 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/DensityLowerThanUP1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_DensityLowerThanUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_DensityLowerThanUP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_DensityLowerThanUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_DensityLowerThanUP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_DensityLowerThanUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_DensityLowerThanUP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp
index a8a185a51fc..7cd9c17a99b 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToChainingTimeStampUP1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_EqualToChainingTimeStampUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_EqualToChainingTimeStampUP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_EqualToChainingTimeStampUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_EqualToChainingTimeStampUP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_EqualToChainingTimeStampUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_EqualToChainingTimeStampUP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp
index b8083f3528e..d6925dd2b44 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/EqualToTimeStampUP1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_EqualToTimeStampUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_EqualToTimeStampUP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_EqualToTimeStampUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_EqualToTimeStampUP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_EqualToTimeStampUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_EqualToTimeStampUP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp
index 8cdabb068ca..9107f0fe326 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/ExternalContourUP1D.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_ExternalContourUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ExternalContourUP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ExternalContourUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ExternalContourUP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ExternalContourUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ExternalContourUP1D(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ExternalContourUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ExternalContourUP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp
index df1a53373c1..6164463a3af 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/FalseUP1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_FalseUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FalseUP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_FalseUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_FalseUP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_FalseUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_FalseUP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp
index 0fb10c1f36c..fc538008446 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/QuantitativeInvisibilityUP1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_QuantitativeInvisibilityUP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_QuantitativeInvisibilityUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_QuantitativeInvisibilityUP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_QuantitativeInvisibilityUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_QuantitativeInvisibilityUP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp
index 752665b4aae..4ec5cc13b3a 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/ShapeUP1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_ShapeUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ShapeUP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ShapeUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ShapeUP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ShapeUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ShapeUP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp b/source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp
index 2b4584c01de..7c8e0a6239d 100644
--- a/source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp
+++ b/source/blender/freestyle/intern/python/UnaryPredicate1D/TrueUP1D.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_TrueUP1D_getName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TrueUP1D_getName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_TrueUP1D___call__(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_TrueUP1D___call__(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_TrueUP1D(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_TrueUP1D(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp
index 53dbfc9b320..18ab37aeecd 100644
--- a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp
+++ b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator.cpp
@@ -1,36 +1,36 @@
-SWIGINTERN PyObject *_wrap_ChainingIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainingIterator_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ChainingIterator_init(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainingIterator_init(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ChainingIterator_traverse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainingIterator_traverse(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ChainingIterator_getVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainingIterator_getVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ChainingIterator_isIncrementing(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainingIterator_isIncrementing(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ChainingIterator_increment(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainingIterator_increment(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ChainingIterator_decrement(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainingIterator_decrement(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ChainingIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ChainingIterator(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_ChainingIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_ChainingIterator(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp
index 2f4c5645b47..3b3b4433e59 100644
--- a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp
+++ b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainPredicateIterator.cpp
@@ -1,12 +1,12 @@
-SWIGINTERN PyObject *_wrap_ChainPredicateIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainPredicateIterator_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ChainPredicateIterator_traverse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainPredicateIterator_traverse(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_ChainPredicateIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_ChainPredicateIterator(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp
index 20a4a5d7c46..53d37c1578c 100644
--- a/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp
+++ b/source/blender/freestyle/intern/python/ViewEdgeIterator/ChainingIterator/ChainSilhouetteIterator.cpp
@@ -1,16 +1,16 @@
-SWIGINTERN PyObject *_wrap_ChainSilhouetteIterator_getExactTypeName(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainSilhouetteIterator_getExactTypeName(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ChainSilhouetteIterator_traverse(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ChainSilhouetteIterator_traverse(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ChainSilhouetteIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ChainSilhouetteIterator(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_disown_ChainSilhouetteIterator(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_disown_ChainSilhouetteIterator(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/ViewMap.cpp b/source/blender/freestyle/intern/python/ViewMap.cpp
index ecd3fe21e44..24a986b3885 100644
--- a/source/blender/freestyle/intern/python/ViewMap.cpp
+++ b/source/blender/freestyle/intern/python/ViewMap.cpp
@@ -1,104 +1,104 @@
-SWIGINTERN PyObject *_wrap_ViewMap_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_userdata_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_userdata_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewMap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ViewMap(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ViewMap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ViewMap(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_GetClosestViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_GetClosestViewEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_GetClosestFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_GetClosestFEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_getInstance(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_getInstance(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_ViewShapes(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_ViewShapes(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_ViewEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_ViewEdges(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_ViewVertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_ViewVertices(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_FEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_FEdges(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_SVertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_SVertices(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_viewedges_begin(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_viewedges_begin(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_viewedges_end(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_viewedges_end(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_viewedges_size(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_viewedges_size(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_viewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_viewShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_shapeIdToIndexMap(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_shapeIdToIndexMap(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_getScene3dBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_getScene3dBBox(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_AddViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_AddViewShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_AddViewEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_AddViewEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_AddViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_AddViewVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_AddFEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_AddFEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_AddSVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_AddSVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_setScene3dBBox(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_setScene3dBBox(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_CreateTVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_CreateTVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewMap_InsertViewVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewMap_InsertViewVertex(PyObject *self , PyObject *args) {
 }
 
 
diff --git a/source/blender/freestyle/intern/python/ViewShape.cpp b/source/blender/freestyle/intern/python/ViewShape.cpp
index f95e0f829b0..023ce06f44f 100644
--- a/source/blender/freestyle/intern/python/ViewShape.cpp
+++ b/source/blender/freestyle/intern/python/ViewShape.cpp
@@ -1,88 +1,88 @@
-SWIGINTERN PyObject *_wrap_ViewShape_userdata_set(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_userdata_set(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_userdata_get(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_userdata_get(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewShape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ViewShape__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewShape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ViewShape__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewShape__SWIG_2(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_new_ViewShape__SWIG_2(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_new_ViewShape(PyObject *self, PyObject *args) {
+ PyObject *_wrap_new_ViewShape(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_dupplicate(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_dupplicate(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_delete_ViewShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_delete_ViewShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_SplitEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_SplitEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_sshape__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_sshape__SWIG_0(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_sshape__SWIG_1(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_sshape__SWIG_1(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_sshape(PyObject *self, PyObject *args) {
+ PyObject *_wrap_ViewShape_sshape(PyObject *self, PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_vertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_vertices(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_edges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_edges(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_getId(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_getId(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_SetSShape(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_SetSShape(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_SetVertices(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_SetVertices(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_SetEdges(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_SetEdges(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_AddVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_AddVertex(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_AddEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_AddEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_RemoveEdge(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_RemoveEdge(PyObject *self , PyObject *args) {
 }
 
 
-SWIGINTERN PyObject *_wrap_ViewShape_RemoveVertex(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+ PyObject *_wrap_ViewShape_RemoveVertex(PyObject *self , PyObject *args) {
 }