soc-2008-mxcurioni: reimplemented the initialization/allocation for base classes. The Python object type tp_new slot is now set to PyType_GenericNew, instead of the former custom functions. As a note, by default, Python does not set this slot: it is therefore mandatory for the base classes. For children classes, only __init__ is needed.

To make our base classes subclasses, the Py_TPFLAGS_BASETYPE flag was added to the object type tp_flags slot.

Finally, I began to implement CurvePoint, descendant of Interface0D. This commit allowed me to verify that my SWIG replacement method works: interfaces are well taken into account by children. For a test, use the following code:

================================

import Blender
from Blender import Freestyle
from Blender.Freestyle import *

print Interface0D()
print CurvePoint()

================================

The __repr__ method is only implemented in Interface0D:

PyObject * Interface0D___repr__(BPy_Interface0D* self)
{
   return PyString_FromFormat("type: %s - address: %p", self->if0D->getExactTypeName().c_str(), self->if0D );}

and the result is of the form:

type: Interface0D - address: 0x18e5ccc0
type: CurvePoint - address: 0x18e473f0

As you can see, the correct getExactTypeName of the class is called. 

8 files changed, 314 insertions, 250 deletions

diff --git a/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
index 107216a6b50..d76c1ba78ba 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
@@ -10,7 +10,7 @@ extern "C" {
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 /*---------------  Python API function prototypes for BinaryPredicate0D instance  -----------*/
-static PyObject * BinaryPredicate0D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds);
+static int BinaryPredicate0D___init__(BPy_BinaryPredicate0D *self, PyObject *args, PyObject *kwds);
 static void BinaryPredicate0D___dealloc__(BPy_BinaryPredicate0D *self);
 static PyObject * BinaryPredicate0D___repr__(BPy_BinaryPredicate0D *self);
 
@@ -59,7 +59,7 @@ PyTypeObject BinaryPredicate0D_Type = {
 	NULL,                       /* PyBufferProcs *tp_as_buffer; */
 
   /*** Flags to define presence of optional/expanded features ***/
-	Py_TPFLAGS_DEFAULT, 		/* long tp_flags; */
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
 
 	NULL,                       /*  char *tp_doc;  Documentation string */
   /*** Assigned meaning in release 2.0 ***/
@@ -90,9 +90,9 @@ PyTypeObject BinaryPredicate0D_Type = {
 	NULL,							/* descrgetfunc tp_descr_get; */
 	NULL,							/* descrsetfunc tp_descr_set; */
 	0,                          	/* long tp_dictoffset; */
-	NULL,                       	/* initproc tp_init; */
+	(initproc)BinaryPredicate0D___init__, /* initproc tp_init; */
 	NULL,							/* allocfunc tp_alloc; */
-	(newfunc)BinaryPredicate0D___new__,		/* newfunc tp_new; */
+	PyType_GenericNew,		/* newfunc tp_new; */
 	
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
@@ -124,16 +124,10 @@ PyMODINIT_FUNC BinaryPredicate0D_Init( PyObject *module )
 
 //------------------------INSTANCE METHODS ----------------------------------
 
-PyObject * BinaryPredicate0D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds)
+int BinaryPredicate0D___init__(BPy_BinaryPredicate0D *self, PyObject *args, PyObject *kwds)
 {
-    BPy_BinaryPredicate0D *self;
-
-    self = (BPy_BinaryPredicate0D *)type->tp_alloc(type, 0);
-    if (self != NULL) {
-        self->bp0D = new BinaryPredicate0D();
-    }
-
-    return (PyObject *)self;
+	self->bp0D = new BinaryPredicate0D();
+	return 0;
 }
 
 void BinaryPredicate0D___dealloc__(BPy_BinaryPredicate0D* self)
@@ -142,6 +136,7 @@ void BinaryPredicate0D___dealloc__(BPy_BinaryPredicate0D* self)
     self->ob_type->tp_free((PyObject*)self);
 }
 
+
 PyObject * BinaryPredicate0D___repr__(BPy_BinaryPredicate0D* self)
 {
     return PyString_FromFormat("type: %s - address: %p", self->bp0D->getName().c_str(), self->bp0D );
diff --git a/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp b/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
index afdab7c08ed..73d5a3a4232 100644
--- a/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
+++ b/source/blender/freestyle/intern/python/BinaryPredicate1D.cpp
@@ -10,7 +10,7 @@ extern "C" {
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 /*---------------  Python API function prototypes for BinaryPredicate1D instance  -----------*/
-static PyObject * BinaryPredicate1D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds);
+static int BinaryPredicate1D___init__(BPy_BinaryPredicate1D *self, PyObject *args, PyObject *kwds);
 static void BinaryPredicate1D___dealloc__(BPy_BinaryPredicate1D *self);
 static PyObject * BinaryPredicate1D___repr__(BPy_BinaryPredicate1D *self);
 
@@ -58,7 +58,7 @@ PyTypeObject BinaryPredicate1D_Type = {
 	NULL,                       /* PyBufferProcs *tp_as_buffer; */
 
   /*** Flags to define presence of optional/expanded features ***/
-	Py_TPFLAGS_DEFAULT, 		/* long tp_flags; */
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
 
 	NULL,                       /*  char *tp_doc;  Documentation string */
   /*** Assigned meaning in release 2.0 ***/
@@ -89,9 +89,9 @@ PyTypeObject BinaryPredicate1D_Type = {
 	NULL,                       	/* descrgetfunc tp_descr_get; */
 	NULL,                       	/* descrsetfunc tp_descr_set; */
 	0,                          	/* long tp_dictoffset; */
-	NULL,                       	/* initproc tp_init; */
+	(initproc)BinaryPredicate1D___init__,                       	/* initproc tp_init; */
 	NULL,                       	/* allocfunc tp_alloc; */
-	BinaryPredicate1D___new__,		/* newfunc tp_new; */
+	PyType_GenericNew,		/* newfunc tp_new; */
 	
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
@@ -124,16 +124,10 @@ PyMODINIT_FUNC BinaryPredicate1D_Init( PyObject *module )
 
 //------------------------INSTANCE METHODS ----------------------------------
 
-PyObject * BinaryPredicate1D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds)
+int BinaryPredicate1D___init__(BPy_BinaryPredicate1D *self, PyObject *args, PyObject *kwds)
 {
-    BPy_BinaryPredicate1D *self;
-
-    self = (BPy_BinaryPredicate1D *)type->tp_alloc(type, 0);
-    if (self != NULL) {
-        self->bp1D = new BinaryPredicate1D();
-    }
-
-    return (PyObject *)self;
+	self->bp1D = new BinaryPredicate1D();
+	return 0;
 }
 
 void BinaryPredicate1D___dealloc__(BPy_BinaryPredicate1D* self)
diff --git a/source/blender/freestyle/intern/python/Freestyle.cpp b/source/blender/freestyle/intern/python/Freestyle.cpp
index 93d01b29040..9630aa38f80 100644
--- a/source/blender/freestyle/intern/python/Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/Freestyle.cpp
@@ -4,8 +4,10 @@
 #include "BinaryPredicate1D.h"
 #include "Id.h"
 #include "Interface0D.h"
+#include "Interface0D/CurvePoint.h"
 #include "Interface1D.h"
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/source/blender/freestyle/intern/python/Id.cpp b/source/blender/freestyle/intern/python/Id.cpp
index 1f862df0204..3c769933dcc 100644
--- a/source/blender/freestyle/intern/python/Id.cpp
+++ b/source/blender/freestyle/intern/python/Id.cpp
@@ -9,9 +9,8 @@ extern "C" {
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 /*---------------  Python API function prototypes for Id instance  -----------*/
-static PyObject * Id___new__(PyTypeObject *type, PyObject *args, PyObject *kwds);
-static void Id___dealloc__(BPy_Id *self);
 static int Id___init__(BPy_Id *self, PyObject *args, PyObject *kwds);
+static void Id___dealloc__(BPy_Id *self);
 static PyObject * Id___repr__(BPy_Id* self);
 
 static PyObject * Id_getFirst( BPy_Id *self );
@@ -69,7 +68,7 @@ PyTypeObject Id_Type = {
 	NULL,                       /* PyBufferProcs *tp_as_buffer; */
 
   /*** Flags to define presence of optional/expanded features ***/
-	Py_TPFLAGS_DEFAULT, 		/* long tp_flags; */
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
 
 	NULL,                       /*  char *tp_doc;  Documentation string */
   /*** Assigned meaning in release 2.0 ***/
@@ -102,7 +101,7 @@ PyTypeObject Id_Type = {
 	0,                          	/* long tp_dictoffset; */
 	(initproc)Id___init__,           /* initproc tp_init; */
 	NULL,							/* allocfunc tp_alloc; */
-	Id___new__,						/* newfunc tp_new; */
+	PyType_GenericNew,						/* newfunc tp_new; */
 	
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
@@ -134,24 +133,6 @@ PyMODINIT_FUNC Id_Init( PyObject *module )
 
 //------------------------INSTANCE METHODS ----------------------------------
 
-PyObject * Id___new__(PyTypeObject *type, PyObject *args, PyObject *kwds)
-{
-    BPy_Id *self;
-
-    self = (BPy_Id *)type->tp_alloc(type, 0);
-    if (self != NULL) {
-        self->id = new Id();
-    }
-
-    return (PyObject *)self;
-}
-
-void Id___dealloc__(BPy_Id* self)
-{
-	delete self->id;
-    self->ob_type->tp_free((PyObject*)self);
-}
-
 int Id___init__(BPy_Id *self, PyObject *args, PyObject *kwds)
 {
     int first = 0, second = 0;
@@ -160,12 +141,17 @@ int Id___init__(BPy_Id *self, PyObject *args, PyObject *kwds)
     if (! PyArg_ParseTupleAndKeywords(args, kwds, "|ii", kwlist, &first, &second) )
         return -1;
 
-	self->id->setFirst( first );
-	self->id->setSecond( second );
+	self->id = new Id( first, second );
 
     return 0;
 }
 
+void Id___dealloc__(BPy_Id* self)
+{
+	delete self->id;
+    self->ob_type->tp_free((PyObject*)self);
+}
+
 PyObject * Id___repr__(BPy_Id* self)
 {
     return PyString_FromFormat("[ first: %i, second: %i ](BPy_Id)", self->id->getFirst(), self->id->getSecond() );
diff --git a/source/blender/freestyle/intern/python/Interface0D.cpp b/source/blender/freestyle/intern/python/Interface0D.cpp
index 47b9b28839f..216dbaec1e9 100644
--- a/source/blender/freestyle/intern/python/Interface0D.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D.cpp
@@ -1,6 +1,7 @@
 #include "Interface0D.h"
 
 #include "Convert.h"
+#include "Interface0D/CurvePoint.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -9,7 +10,7 @@ extern "C" {
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 /*---------------  Python API function prototypes for Interface0D instance  -----------*/
-static PyObject * Interface0D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds);
+static int Interface0D___init__(BPy_Interface0D *self, PyObject *args, PyObject *kwds);
 static void Interface0D___dealloc__(BPy_Interface0D *self);
 static PyObject * Interface0D___repr__(BPy_Interface0D *self);
 
@@ -78,7 +79,7 @@ PyTypeObject Interface0D_Type = {
 	NULL,                       /* PyBufferProcs *tp_as_buffer; */
 
   /*** Flags to define presence of optional/expanded features ***/
-	Py_TPFLAGS_DEFAULT, 		/* long tp_flags; */
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
 
 	NULL,                       /*  char *tp_doc;  Documentation string */
   /*** Assigned meaning in release 2.0 ***/
@@ -109,9 +110,9 @@ PyTypeObject Interface0D_Type = {
 	NULL,							/* descrgetfunc tp_descr_get; */
 	NULL,							/* descrsetfunc tp_descr_set; */
 	0,                          	/* long tp_dictoffset; */
-	NULL,                       	/* initproc tp_init; */
+	(initproc)Interface0D___init__,                       	/* initproc tp_init; */
 	NULL,							/* allocfunc tp_alloc; */
-	(newfunc)Interface0D___new__,		/* newfunc tp_new; */
+	PyType_GenericNew,		/* newfunc tp_new; */
 	
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
@@ -136,23 +137,22 @@ PyMODINIT_FUNC Interface0D_Init( PyObject *module )
 
 	if( PyType_Ready( &Interface0D_Type ) < 0 )
 		return;
+		
+	if( PyType_Ready( &CurvePoint_Type ) < 0 )
+		return;
 
 	Py_INCREF( &Interface0D_Type );
 	PyModule_AddObject(module, "Interface0D", (PyObject *)&Interface0D_Type);
+	Py_INCREF( &CurvePoint_Type );
+	PyModule_AddObject(module, "CurvePoint", (PyObject *)&CurvePoint_Type);
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
 
-PyObject * Interface0D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds)
+int Interface0D___init__(BPy_Interface0D *self, PyObject *args, PyObject *kwds)
 {
-    BPy_Interface0D *self;
-
-    self = (BPy_Interface0D *)type->tp_alloc(type, 0);
-    if (self != NULL) {
-        self->if0D = new Interface0D();
-    }
-
-    return (PyObject *)self;
+	self->if0D = new Interface0D();
+	return 0;
 }
 
 void Interface0D___dealloc__(BPy_Interface0D* self)
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
index 6591973f8b3..e360062b9d6 100644
--- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.cpp
@@ -1,176 +1,238 @@
-PyObject *CurvePoint_getExactTypeName(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getX(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getY(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getZ(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getPoint3D(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getProjectedX(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getProjectedY(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getProjectedZ(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getPoint2D(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getFEdge(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getId(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_getNature(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_castToSVertex(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_castToViewVertex(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_castToNonTVertex(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_castToTVertex(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_CurvePoint__SWIG_0(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_CurvePoint__SWIG_1(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_CurvePoint__SWIG_2(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_CurvePoint__SWIG_3(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_new_CurvePoint(PyObject *self, PyObject *args) {
-}
-
-
- PyObject *_wrap_delete_CurvePoint(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint___eq__(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_A(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_B(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_t2d(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_SetA(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_SetB(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_SetT2d(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_fedge(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_point2d(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_point3d(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_normal(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_shape(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_occluders_begin(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_occluders_end(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_occluders_empty(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_occluders_size(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_occludee(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_occluded_shape(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_occludee_empty(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_z_discontinuity(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_curvatureFredo(PyObject *self , PyObject *args) {
-}
-
-
-PyObject *CurvePoint_directionFredo(PyObject *self , PyObject *args) {
-}
+#include "CurvePoint.h"
+
+#include "../Convert.h"
+#include "../../stroke/Curve.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for CurvePoint instance  -----------*/
+static int CurvePoint___init__(BPy_CurvePoint *self, PyObject *args, PyObject *kwds);
+
+/*----------------------CurvePoint instance definitions ----------------------------*/
+static PyMethodDef BPy_CurvePoint_methods[] = {	
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_CurvePoint type definition ------------------------------*/
+
+PyTypeObject CurvePoint_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"CurvePoint",				/* tp_name */
+	sizeof( BPy_CurvePoint ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	NULL,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	NULL,					/* tp_repr */
+
+	/* Method suites for standard classes */
+
+	NULL,                       /* PyNumberMethods *tp_as_number; */
+	NULL,                       /* PySequenceMethods *tp_as_sequence; */
+	NULL,                       /* PyMappingMethods *tp_as_mapping; */
+
+	/* More standard operations (here for binary compatibility) */
+
+	NULL,						/* hashfunc tp_hash; */
+	NULL,                       /* ternaryfunc tp_call; */
+	NULL,                       /* reprfunc tp_str; */
+	NULL,                       /* getattrofunc tp_getattro; */
+	NULL,                       /* setattrofunc tp_setattro; */
+
+	/* Functions to access object as input/output buffer */
+	NULL,                       /* PyBufferProcs *tp_as_buffer; */
+
+  /*** Flags to define presence of optional/expanded features ***/
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
+
+	NULL,                       /*  char *tp_doc;  Documentation string */
+  /*** Assigned meaning in release 2.0 ***/
+	/* call function for all accessible objects */
+	NULL,                       /* traverseproc tp_traverse; */
+
+	/* delete references to contained objects */
+	NULL,                       /* inquiry tp_clear; */
+
+  /***  Assigned meaning in release 2.1 ***/
+  /*** rich comparisons ***/
+	NULL,                       /* richcmpfunc tp_richcompare; */
+
+  /***  weak reference enabler ***/
+	0,                          /* long tp_weaklistoffset; */
+
+  /*** Added in release 2.2 ***/
+	/*   Iterators */
+	NULL,                       /* getiterfunc tp_iter; */
+	NULL,                       /* iternextfunc tp_iternext; */
+
+  /*** Attribute descriptor and subclassing stuff ***/
+	BPy_CurvePoint_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Interface0D_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)CurvePoint___init__,                       	/* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	NULL,		/* newfunc tp_new; */
+	
+	/*  Low-level free-memory routine */
+	NULL,                       /* freefunc tp_free;  */
+	
+	/* For PyObject_IS_GC */
+	NULL,                       /* inquiry tp_is_gc;  */
+	NULL,                       /* PyObject *tp_bases; */
+	
+	/* method resolution order */
+	NULL,                       /* PyObject *tp_mro;  */
+	NULL,                       /* PyObject *tp_cache; */
+	NULL,                       /* PyObject *tp_subclasses; */
+	NULL,                       /* PyObject *tp_weaklist; */
+	NULL
+};
+
+//-------------------MODULE INITIALIZATION--------------------------------
+
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int CurvePoint___init__(BPy_CurvePoint *self, PyObject *args, PyObject *kwds)
+{
+
+	self->py_if0D.if0D = new CurvePoint();
+	return 0;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+ 
+// 
+//  PyObject *_wrap_new_CurvePoint__SWIG_0(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_CurvePoint__SWIG_1(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_CurvePoint__SWIG_2(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_CurvePoint__SWIG_3(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_new_CurvePoint(PyObject *self, PyObject *args) {
+// }
+// 
+// 
+//  PyObject *_wrap_delete_CurvePoint(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint___eq__(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_A(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_B(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_t2d(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_SetA(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_SetB(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_SetT2d(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_fedge(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_point2d(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_point3d(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_normal(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_shape(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_occluders_begin(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_occluders_end(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_occluders_empty(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_occluders_size(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_occludee(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_occluded_shape(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_occludee_empty(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_z_discontinuity(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_curvatureFredo(PyObject *self , PyObject *args) {
+// }
+// 
+// 
+// PyObject *CurvePoint_directionFredo(PyObject *self , PyObject *args) {
+// }
 
 
diff --git a/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h
new file mode 100644
index 00000000000..096de2efed3
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_CURVEPOINT_H
+#define FREESTYLE_PYTHON_CURVEPOINT_H
+
+#include "../Interface0D.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject CurvePoint_Type;
+
+#define BPy_CurvePoint_Check(v) \
+    ((v)->ob_type == &CurvePoint_Type)
+
+/*---------------------------Python BPy_CurvePoint structure definition----------*/
+typedef struct {
+	BPy_Interface0D py_if0D;
+} BPy_CurvePoint;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_CURVEPOINT_H */
diff --git a/source/blender/freestyle/intern/python/Interface1D.cpp b/source/blender/freestyle/intern/python/Interface1D.cpp
index 7511401198b..27bb71b2f50 100644
--- a/source/blender/freestyle/intern/python/Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D.cpp
@@ -9,7 +9,7 @@ extern "C" {
 ///////////////////////////////////////////////////////////////////////////////////////////
 
 /*---------------  Python API function prototypes for Interface1D instance  -----------*/
-static PyObject * Interface1D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds);
+static int Interface1D___init__(BPy_Interface1D *self, PyObject *args, PyObject *kwds);
 static void Interface1D___dealloc__(BPy_Interface1D *self);
 static PyObject * Interface1D___repr__(BPy_Interface1D *self);
 
@@ -70,7 +70,7 @@ PyTypeObject Interface1D_Type = {
 	NULL,                       /* PyBufferProcs *tp_as_buffer; */
 
   /*** Flags to define presence of optional/expanded features ***/
-	Py_TPFLAGS_DEFAULT, 		/* long tp_flags; */
+	Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, 		/* long tp_flags; */
 
 	NULL,                       /*  char *tp_doc;  Documentation string */
   /*** Assigned meaning in release 2.0 ***/
@@ -101,9 +101,9 @@ PyTypeObject Interface1D_Type = {
 	NULL,							/* descrgetfunc tp_descr_get; */
 	NULL,							/* descrsetfunc tp_descr_set; */
 	0,                          	/* long tp_dictoffset; */
-	NULL,                       	/* initproc tp_init; */
+	(initproc)Interface1D___init__,                       	/* initproc tp_init; */
 	NULL,							/* allocfunc tp_alloc; */
-	(newfunc)Interface1D___new__,		/* newfunc tp_new; */
+	PyType_GenericNew,		/* newfunc tp_new; */
 	
 	/*  Low-level free-memory routine */
 	NULL,                       /* freefunc tp_free;  */
@@ -135,16 +135,10 @@ PyMODINIT_FUNC Interface1D_Init( PyObject *module )
 
 //------------------------INSTANCE METHODS ----------------------------------
 
-PyObject * Interface1D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds)
+int Interface1D___init__(BPy_Interface1D *self, PyObject *args, PyObject *kwds)
 {
-    BPy_Interface1D *self;
-
-    self = (BPy_Interface1D *)type->tp_alloc(type, 0);
-    if (self != NULL) {
-        self->if1D = new Interface1D();
-    }
-
-    return (PyObject *)self;
+	self->if1D = new Interface1D();
+	return 0;
 }
 
 void Interface1D___dealloc__(BPy_Interface1D* self)