soc-2008-mxcurioni: implemented (but did not test) the following classes: Material, Chain, FEdgeSharp, FEdgeSmooth. All Interface1D classes have now been fully implemented.

14 files changed, 1157 insertions, 139 deletions

diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index 1edc4cf1e16..4d66b46420a 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -1,6 +1,7 @@
 #include "BPy_Convert.h"
 
 #include "BPy_BBox.h"
+#include "BPy_FrsMaterial.h"
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
 #include "BPy_Interface0D.h"
@@ -181,6 +182,12 @@ PyObject * BPy_StrokeVertexIterator_from_StrokeVertexIterator( StrokeInternal::S
 	return py_sv_it;
 }
 
+PyObject * BPy_FrsMaterial_from_Material( Material& m ){
+	PyObject *py_m = FrsMaterial_Type.tp_new( &FrsMaterial_Type, 0, 0 );
+	((BPy_FrsMaterial*) py_m)->m = new Material( m );
+
+	return py_m;
+}
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h
index ab80908cf8f..9bf535ead6a 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -17,6 +17,9 @@ using namespace Geometry;
 // Interface0D, Interface0DIteratorNested, Interface0DIterator
 #include "../view_map/Interface0D.h"
 
+// Material
+#include "../scene_graph/Material.h"
+
 // Stroke, StrokeAttribute, StrokeVertex
 #include "../stroke/Stroke.h"
 
@@ -36,6 +39,8 @@ using namespace Geometry;
 // StrokeInternal::StrokeVertexIterator
 #include "../stroke/StrokeIterators.h"
 
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -57,6 +62,7 @@ PyObject * BPy_BBox_from_BBox( BBox< Vec3r > &bb );
 PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
 PyObject * BPy_Id_from_Id( Id& id );
 PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
+PyObject * BPy_FrsMaterial_from_Material( Material& m );
 PyObject * BPy_Nature_from_Nature( unsigned short n );
 PyObject * BPy_MediumType_from_MediumType( int n );
 PyObject * BPy_SShape_from_SShape( SShape& ss );
diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
index 0496060d0f3..13164d0a153 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
@@ -3,6 +3,7 @@
 #include "BPy_BBox.h"
 #include "BPy_BinaryPredicate0D.h"
 #include "BPy_BinaryPredicate1D.h"
+#include "BPy_FrsMaterial.h"
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
 #include "BPy_Interface0D.h"
@@ -144,6 +145,7 @@ PyObject *Freestyle_Init( void )
 	BBox_Init( module );
 	BinaryPredicate0D_Init( module );
 	BinaryPredicate1D_Init( module );
+	FrsMaterial_Init( module );
 	Id_Init( module );
 	IntegrationType_Init( module );
 	Interface0D_Init( module );
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
new file mode 100644
index 00000000000..052583e4621
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
@@ -0,0 +1,407 @@
+#include "BPy_FrsMaterial.h"
+
+#include "BPy_Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for FrsMaterial instance  -----------*/
+static int FrsMaterial___init__(BPy_FrsMaterial *self, PyObject *args, PyObject *kwds);
+static void FrsMaterial___dealloc__(BPy_FrsMaterial *self);
+static PyObject * FrsMaterial___repr__(BPy_FrsMaterial *self);
+
+static PyObject * FrsMaterial_diffuse( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_diffuseR( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_diffuseG( BPy_FrsMaterial* self) ;
+static PyObject * FrsMaterial_diffuseB( BPy_FrsMaterial* self) ;
+static PyObject * FrsMaterial_diffuseA( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_specular( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_specularR( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_specularG( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_specularB( BPy_FrsMaterial* self) ;
+static PyObject * FrsMaterial_specularA( BPy_FrsMaterial* self) ;
+static PyObject * FrsMaterial_ambient( BPy_FrsMaterial* self) ;
+static PyObject * FrsMaterial_ambientR( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_ambientG( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_ambientB( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_ambientA( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_emission( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_emissionR( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_emissionG( BPy_FrsMaterial* self) ;
+static PyObject * FrsMaterial_emissionB( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_emissionA( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_shininess( BPy_FrsMaterial* self);
+static PyObject * FrsMaterial_setDiffuse( BPy_FrsMaterial *self, PyObject *args );
+static PyObject * FrsMaterial_setSpecular( BPy_FrsMaterial *self, PyObject *args );
+static PyObject * FrsMaterial_setAmbient( BPy_FrsMaterial *self, PyObject *args );
+static PyObject * FrsMaterial_setEmission( BPy_FrsMaterial *self, PyObject *args );
+static PyObject * FrsMaterial_setShininess( BPy_FrsMaterial *self, PyObject *args );
+
+/*----------------------FrsMaterial instance definitions ----------------------------*/
+static PyMethodDef BPy_FrsMaterial_methods[] = {
+	{"diffuse", ( PyCFunction ) FrsMaterial_diffuse, METH_NOARGS, "() Returns the diffuse color as a 4 float array"},
+	{"diffuseR", ( PyCFunction ) FrsMaterial_diffuseR, METH_NOARGS, "() Returns the red component of the diffuse color "},
+	{"diffuseG", ( PyCFunction ) FrsMaterial_diffuseG, METH_NOARGS, "() Returns the green component of the diffuse color "},
+	{"diffuseB", ( PyCFunction ) FrsMaterial_diffuseB, METH_NOARGS, "() Returns the blue component of the diffuse color "},
+	{"diffuseA", ( PyCFunction ) FrsMaterial_diffuseA, METH_NOARGS, "() Returns the alpha component of the diffuse color "},
+	{"specular", ( PyCFunction ) FrsMaterial_specular, METH_NOARGS, "() Returns the specular color as a 4 float array"},
+	{"specularR", ( PyCFunction ) FrsMaterial_specularR, METH_NOARGS, "() Returns the red component of the specular color "},
+	{"specularG", ( PyCFunction ) FrsMaterial_specularG, METH_NOARGS, "() Returns the green component of the specular color "},
+	{"specularB", ( PyCFunction ) FrsMaterial_specularB, METH_NOARGS, "() Returns the blue component of the specular color "},
+	{"specularA", ( PyCFunction ) FrsMaterial_specularA, METH_NOARGS, "() Returns the alpha component of the specular color "},
+	{"ambient", ( PyCFunction ) FrsMaterial_ambient, METH_NOARGS, "() Returns the ambient color as a 4 float array"},
+	{"ambientR", ( PyCFunction ) FrsMaterial_ambientR, METH_NOARGS, "() Returns the red component of the ambient color "},
+	{"ambientG", ( PyCFunction ) FrsMaterial_ambientG, METH_NOARGS, "() Returns the green component of the ambient color "},
+	{"ambientB", ( PyCFunction ) FrsMaterial_ambientB, METH_NOARGS, "() Returns the blue component of the ambient color "},
+	{"ambientA", ( PyCFunction ) FrsMaterial_ambientA, METH_NOARGS, "() Returns the alpha component of the ambient color "},
+	{"emission", ( PyCFunction ) FrsMaterial_emission, METH_NOARGS, "() Returns the emission color as a 4 float array"},
+	{"emissionR", ( PyCFunction ) FrsMaterial_emissionR, METH_NOARGS, "() Returns the red component of the emission color "},
+	{"emissionG", ( PyCFunction ) FrsMaterial_emissionG, METH_NOARGS, "() Returns the green component of the emission color "},
+	{"emissionB", ( PyCFunction ) FrsMaterial_emissionB, METH_NOARGS, "() Returns the blue component of the emission color "},
+	{"emissionA", ( PyCFunction ) FrsMaterial_emissionA, METH_NOARGS, "() Returns the alpha component of the emission color "},
+	{"shininess", ( PyCFunction ) FrsMaterial_shininess, METH_NOARGS, "() Returns the shininess coefficient "},
+	{"setDiffuse", ( PyCFunction ) FrsMaterial_setDiffuse, METH_NOARGS, "(float r, float g, float b, float a) Sets the diffuse color"},
+	{"setSpecular", ( PyCFunction ) FrsMaterial_setSpecular, METH_NOARGS, "(float r, float g, float b, float a) Sets the specular color"},
+	{"setAmbient", ( PyCFunction ) FrsMaterial_setAmbient, METH_NOARGS, "(float r, float g, float b, float a) Sets the ambient color"},
+	{"setEmission", ( PyCFunction ) FrsMaterial_setEmission, METH_NOARGS, "(float r, float g, float b, float a) Sets the emission color"},
+	{"setShininess", ( PyCFunction ) FrsMaterial_setShininess, METH_NOARGS, "(float r, float g, float b, float a) Sets the shininess color"},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_FrsMaterial type definition ------------------------------*/
+
+PyTypeObject FrsMaterial_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"FrsMaterial",				/* tp_name */
+	sizeof( BPy_FrsMaterial ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)FrsMaterial___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)FrsMaterial___repr__,					/* 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_FrsMaterial_methods,	/* 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; */
+	(initproc)FrsMaterial___init__, /* initproc tp_init; */
+	NULL,							/* allocfunc tp_alloc; */
+	PyType_GenericNew,		/* 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--------------------------------
+PyMODINIT_FUNC FrsMaterial_Init( PyObject *module )
+{
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &FrsMaterial_Type ) < 0 )
+		return;
+
+	Py_INCREF( &FrsMaterial_Type );
+	PyModule_AddObject(module, "FrsMaterial", (PyObject *)&FrsMaterial_Type);
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int FrsMaterial___init__(BPy_FrsMaterial *self, PyObject *args, PyObject *kwds)
+{
+	PyObject *obj1 = 0;
+	float f1 = 0, f2 = 0., f3 = 0., f4 = 0., f5 = 0.;
+
+    if (! PyArg_ParseTuple(args, "|Offff", &obj1, &f2, &f3, &f4, &f5) )
+        return -1;
+
+	if( !obj1 ){
+		self->m = new Material();
+
+	} else if( BPy_FrsMaterial_Check(obj1) ) {
+		if( ((BPy_FrsMaterial *) obj1)->m )
+			self->m = new Material(*( ((BPy_FrsMaterial *) obj1)->m ));
+		else
+			return -1;
+
+	} else if( PyFloat_Check(obj1) ) {
+		f1 = PyFloat_AsDouble(obj1);
+		self->m = new Material(&f1, &f2, &f3, &f4, f5);
+
+	} else {
+		return -1;
+	}
+
+	return 0;
+}
+
+void FrsMaterial___dealloc__( BPy_FrsMaterial* self)
+{
+	delete self->m;
+    self->ob_type->tp_free((PyObject*)self);
+}
+
+
+PyObject * FrsMaterial___repr__( BPy_FrsMaterial* self)
+{
+    return PyString_FromFormat("FrsMaterial - address: %p", self->m );
+}
+
+PyObject * FrsMaterial_diffuse( BPy_FrsMaterial* self) {
+	PyObject *tmp;
+	
+	const float *diffuse = self->m->diffuse();
+	PyObject *py_diffuse = PyList_New(4);
+	
+	tmp = PyFloat_FromDouble( diffuse[0] ); PyList_SetItem( py_diffuse, 0, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( diffuse[1] ); PyList_SetItem( py_diffuse, 1, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( diffuse[2] ); PyList_SetItem( py_diffuse, 2, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( diffuse[3] ); PyList_SetItem( py_diffuse, 3, tmp); Py_DECREF(tmp);
+	
+	return py_diffuse;
+}
+
+PyObject * FrsMaterial_diffuseR( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->diffuseR() );
+}
+
+PyObject * FrsMaterial_diffuseG( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->diffuseG() );
+}
+
+PyObject * FrsMaterial_diffuseB( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->diffuseB() );
+}
+
+PyObject * FrsMaterial_diffuseA( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->diffuseA() );
+}
+
+PyObject * FrsMaterial_specular( BPy_FrsMaterial* self) {
+	PyObject *tmp;
+	
+	const float *specular = self->m->specular();
+	PyObject *py_specular = PyList_New(4);
+	
+	tmp = PyFloat_FromDouble( specular[0] ); PyList_SetItem( py_specular, 0, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( specular[1] ); PyList_SetItem( py_specular, 1, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( specular[2] ); PyList_SetItem( py_specular, 2, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( specular[3] ); PyList_SetItem( py_specular, 3, tmp); Py_DECREF(tmp);
+	
+	return py_specular;
+}
+
+PyObject * FrsMaterial_specularR( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->specularR() );
+}
+
+PyObject * FrsMaterial_specularG( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->specularG() );
+}
+
+PyObject * FrsMaterial_specularB( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->specularB() );
+}
+
+PyObject * FrsMaterial_specularA( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->specularA() );
+}
+
+PyObject * FrsMaterial_ambient( BPy_FrsMaterial* self) {
+	PyObject *tmp;
+	
+	const float *ambient = self->m->ambient();
+	PyObject *py_ambient = PyList_New(4);
+	
+	tmp = PyFloat_FromDouble( ambient[0] ); PyList_SetItem(	py_ambient, 0, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( ambient[1] ); PyList_SetItem(	py_ambient, 1, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( ambient[2] ); PyList_SetItem(	py_ambient, 2, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( ambient[3] ); PyList_SetItem(	py_ambient, 3, tmp); Py_DECREF(tmp);
+	
+	return py_ambient;
+}
+
+PyObject * FrsMaterial_ambientR( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->ambientR() );
+}
+
+PyObject * FrsMaterial_ambientG( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->ambientG() );
+}
+
+PyObject * FrsMaterial_ambientB( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->ambientB() );
+}
+
+PyObject * FrsMaterial_ambientA( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->ambientA() );
+}
+
+PyObject * FrsMaterial_emission( BPy_FrsMaterial* self) {
+	PyObject *tmp;
+	
+	const float *emission = self->m->emission();
+	PyObject *py_emission = PyList_New(4);
+	
+	tmp = PyFloat_FromDouble( emission[0] ); PyList_SetItem( py_emission, 0, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( emission[1] ); PyList_SetItem( py_emission, 1, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( emission[2] ); PyList_SetItem( py_emission, 2, tmp); Py_DECREF(tmp);
+	tmp = PyFloat_FromDouble( emission[3] ); PyList_SetItem( py_emission, 3, tmp); Py_DECREF(tmp);
+	
+	return py_emission;
+}
+
+PyObject * FrsMaterial_emissionR( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->emissionR() );
+}
+
+PyObject * FrsMaterial_emissionG( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->emissionG() );
+}
+
+PyObject * FrsMaterial_emissionB( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->emissionB() );
+}
+
+PyObject * FrsMaterial_emissionA( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->emissionA() );
+}
+
+PyObject * FrsMaterial_shininess( BPy_FrsMaterial* self) {
+	return PyFloat_FromDouble( self->m->shininess() );
+}
+
+PyObject * FrsMaterial_setDiffuse( BPy_FrsMaterial *self, PyObject *args ) {
+	float f1, f2, f3, f4;
+
+	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
+		cout << "ERROR: FrsMaterial_setDiffuse" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->m->setDiffuse(f1, f2, f3, f4);
+
+	Py_RETURN_NONE;
+}
+ 
+PyObject * FrsMaterial_setSpecular( BPy_FrsMaterial *self, PyObject *args ) {
+	float f1, f2, f3, f4;
+
+	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
+		cout << "ERROR: FrsMaterial_setSpecular" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->m->setSpecular(f1, f2, f3, f4);
+
+	Py_RETURN_NONE;
+}
+
+PyObject * FrsMaterial_setAmbient( BPy_FrsMaterial *self, PyObject *args ) {
+	float f1, f2, f3, f4;
+
+	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
+		cout << "ERROR: FrsMaterial_setAmbient" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->m->setAmbient(f1, f2, f3, f4);
+
+	Py_RETURN_NONE;
+}
+
+PyObject * FrsMaterial_setEmission( BPy_FrsMaterial *self, PyObject *args ) {
+	float f1, f2, f3, f4;
+
+	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
+		cout << "ERROR: FrsMaterial_setEmission" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->m->setEmission(f1, f2, f3, f4);
+
+	Py_RETURN_NONE;
+}
+
+PyObject * FrsMaterial_setShininess( BPy_FrsMaterial *self, PyObject *args ) {
+	float f;
+
+	if(!( PyArg_ParseTuple(args, "f", &f)  )) {
+		cout << "ERROR: FrsMaterial_setShininess" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->m->setShininess(f);
+
+	Py_RETURN_NONE;
+}
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
new file mode 100644
index 00000000000..90ed6805974
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
@@ -0,0 +1,36 @@
+#ifndef FREESTYLE_PYTHON_MATERIAL_H
+#define FREESTYLE_PYTHON_MATERIAL_H
+
+#include "../scene_graph/Material.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject FrsMaterial_Type;
+
+#define BPy_FrsMaterial_Check(v)	(( (PyObject *) v)->ob_type == &FrsMaterial_Type)
+
+/*---------------------------Python BPy_FrsMaterial structure definition----------*/
+typedef struct {
+	PyObject_HEAD
+	Material *m;
+} BPy_FrsMaterial;
+
+/*---------------------------Python BPy_FrsMaterial visible prototypes-----------*/
+
+PyMODINIT_FUNC FrsMaterial_Init( PyObject *module );
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* FREESTYLE_PYTHON_MATERIAL_H */
diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
index 5166fca4aef..509dfb23894 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
@@ -2,9 +2,13 @@
 
 #include "BPy_Convert.h"
 #include "Interface1D/BPy_Curve.h"
+#include "Interface1D/Curve/BPy_Chain.h"
 #include "Interface1D/BPy_FEdge.h"
+#include "Interface1D/FEdge/BPy_FEdgeSharp.h"
+#include "Interface1D/FEdge/BPy_FEdgeSmooth.h"
 #include "Interface1D/BPy_Stroke.h"
 #include "Interface1D/BPy_ViewEdge.h"
+
 #include "BPy_MediumType.h"
 
 #ifdef __cplusplus
@@ -142,12 +146,27 @@ PyMODINIT_FUNC Interface1D_Init( PyObject *module )
 		return;
 	Py_INCREF( &Curve_Type );
 	PyModule_AddObject(module, "Curve", (PyObject *)&Curve_Type);
+
+	if( PyType_Ready( &Chain_Type ) < 0 )
+		return;
+	Py_INCREF( &Chain_Type );
+	PyModule_AddObject(module, "Chain", (PyObject *)&Chain_Type);
 	
 	if( PyType_Ready( &FEdge_Type ) < 0 )
 		return;
 	Py_INCREF( &FEdge_Type );
 	PyModule_AddObject(module, "FEdge", (PyObject *)&FEdge_Type);
 
+	if( PyType_Ready( &FEdgeSharp_Type ) < 0 )
+		return;
+	Py_INCREF( &FEdgeSharp_Type );
+	PyModule_AddObject(module, "FEdgeSharp", (PyObject *)&FEdgeSharp_Type);
+	
+	if( PyType_Ready( &FEdgeSmooth_Type ) < 0 )
+		return;
+	Py_INCREF( &FEdgeSmooth_Type );
+	PyModule_AddObject(module, "FEdgeSmooth", (PyObject *)&FEdgeSmooth_Type);
+
 	if( PyType_Ready( &Stroke_Type ) < 0 )
 		return;
 	Py_INCREF( &Stroke_Type );
diff --git a/source/blender/freestyle/intern/python/BPy_Material.cpp b/source/blender/freestyle/intern/python/BPy_Material.cpp
deleted file mode 100644
index 459de449336..00000000000
--- a/source/blender/freestyle/intern/python/BPy_Material.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
- PyObject *_wrap_Material_diffuse(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_diffuseR(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_diffuseG(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_diffuseB(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_diffuseA(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_specular(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_specularR(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_specularG(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_specularB(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_specularA(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_ambient(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_ambientR(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_ambientG(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_ambientB(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_ambientA(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_emission(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_emissionR(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_emissionG(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_emissionB(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_emissionA(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_shininess(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_SetDiffuse(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_SetSpecular(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_SetAmbient(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_SetEmission(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material_SetShininess(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material___ne__(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_Material___eq__(PyObject *self , PyObject *args) {
-}
-
-
diff --git a/source/blender/freestyle/intern/python/BPy_Material.h b/source/blender/freestyle/intern/python/BPy_Material.h
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/source/blender/freestyle/intern/python/BPy_Material.h
+++ /dev/null
diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
index e69de29bb2d..8b6240986b9 100644
--- a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.cpp
@@ -0,0 +1,188 @@
+#include "BPy_Chain.h"
+
+#include "../../BPy_Convert.h"
+#include "../../BPy_Id.h"
+#include "../BPy_ViewEdge.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for Chain instance  -----------*/
+static int Chain___init__(BPy_Chain *self, PyObject *args, PyObject *kwds);
+static PyObject * Chain_push_viewedge_back( BPy_Chain *self, PyObject *args );
+static PyObject * Chain_push_viewedge_front( BPy_Chain *self, PyObject *args );
+
+
+/*----------------------Chain instance definitions ----------------------------*/
+static PyMethodDef BPy_Chain_methods[] = {	
+	{"push_viewedge_back", ( PyCFunction ) Chain_push_viewedge_back, METH_VARARGS, "(ViewEdge ve, bool orientation) Adds a ViewEdge at the end of the chain."},
+	{"push_viewedge_front", ( PyCFunction ) Chain_push_viewedge_front, METH_VARARGS, "(ViewEdge ve, bool orientation) Adds a ViewEdge at the beginning of the chain."},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Chain type definition ------------------------------*/
+
+PyTypeObject Chain_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Chain",				/* tp_name */
+	sizeof( BPy_Chain ),	/* 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_Chain_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&Curve_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)Chain___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 Chain___init__(BPy_Chain *self, PyObject *args, PyObject *kwds)
+{
+
+	PyObject *obj = 0;
+
+    if (! PyArg_ParseTuple(args, "|O", &obj) )
+        return -1;
+
+	if( !obj ){
+		self->c = new Chain();
+		
+	} else if( BPy_Chain_Check(obj) ) {
+		if( ((BPy_Chain *) obj)->c )
+			self->c = new Chain(*( ((BPy_Chain *) obj)->c ));
+		else
+			return -1;
+		
+	} else if( BPy_Id_Check(obj) ) {
+		if( ((BPy_Id *) obj)->id )
+			self->c = new Chain(*( ((BPy_Id *) obj)->id ));
+		else
+			return -1;
+			
+	} else {
+		return -1;
+	}
+
+	self->py_c.c = self->c;
+	self->py_c.py_if1D.if1D = self->c;
+
+	return 0;
+}
+
+
+PyObject * Chain_push_viewedge_back( BPy_Chain *self, PyObject *args ) {
+	PyObject *obj1 = 0, *obj2 = 0;
+
+	if(!( PyArg_ParseTuple(args, "OO", &obj1, &obj2) &&	BPy_ViewEdge_Check(obj1) && PyBool_Check(obj2) )) {
+		cout << "ERROR: Chain_push_viewedge_back" << endl;
+		Py_RETURN_NONE;
+	}
+
+	ViewEdge *ve = ((BPy_ViewEdge *) obj1)->ve;
+	bool orientation = bool_from_PyBool( obj2 );
+	self->c->push_viewedge_back( ve, orientation);
+
+	Py_RETURN_NONE;
+}
+
+PyObject * Chain_push_viewedge_front( BPy_Chain *self, PyObject *args ) {
+	PyObject *obj1 = 0, *obj2 = 0;
+
+	if(!( PyArg_ParseTuple(args, "OO", &obj1, &obj2) &&	BPy_ViewEdge_Check(obj1) && PyBool_Check(obj2) )) {
+		cout << "ERROR: Chain_push_viewedge_front" << endl;
+		Py_RETURN_NONE;
+	}
+
+	ViewEdge *ve = ((BPy_ViewEdge *) obj1)->ve;
+	bool orientation = bool_from_PyBool( obj2 );
+	self->c->push_viewedge_front(ve, orientation);
+
+	Py_RETURN_NONE;
+}
+
+
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h
new file mode 100644
index 00000000000..eaf80033098
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_CHAIN_H
+#define FREESTYLE_PYTHON_CHAIN_H
+
+#include "../BPy_Curve.h"
+#include "../../../stroke/Chain.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject Chain_Type;
+
+#define BPy_Chain_Check(v)	(( (PyObject *) v)->ob_type == &Chain_Type)
+
+/*---------------------------Python BPy_Chain structure definition----------*/
+typedef struct {
+	BPy_Curve py_c;
+	Chain *c;
+} BPy_Chain;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_CHAIN_H */
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
index da409ffe209..22a4dbc378e 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
@@ -1,44 +1,250 @@
- PyObject *_wrap_FEdgeSharp_duplicate(PyObject *self , PyObject *args) {
+#include "BPy_FEdgeSharp.h"
+
+#include "../../BPy_Convert.h"
+#include "../../Interface0D/BPy_SVertex.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for FEdgeSharp instance  -----------*/
+static int FEdgeSharp___init__(BPy_FEdgeSharp *self, PyObject *args, PyObject *kwds);
+
+static PyObject * FEdgeSharp_normalA( BPy_FEdgeSharp *self ) ;
+static PyObject * FEdgeSharp_normalB( BPy_FEdgeSharp *self );
+static PyObject * FEdgeSharp_aMaterialIndex( BPy_FEdgeSharp *self ) ;
+static PyObject * FEdgeSharp_bMaterialIndex( BPy_FEdgeSharp *self );
+static PyObject * FEdgeSharp_aMaterial( BPy_FEdgeSharp *self );
+static PyObject * FEdgeSharp_bMaterial( BPy_FEdgeSharp *self );
+static PyObject * FEdgeSharp_setNormalA( BPy_FEdgeSharp *self, PyObject *args );
+static PyObject * FEdgeSharp_setNormalB( BPy_FEdgeSharp *self, PyObject *args );
+static PyObject * FEdgeSharp_setaMaterialIndex( BPy_FEdgeSharp *self, PyObject *args );
+static PyObject * FEdgeSharp_setbMaterialIndex( BPy_FEdgeSharp *self, PyObject *args );
+
+/*----------------------FEdgeSharp instance definitions ----------------------------*/
+static PyMethodDef BPy_FEdgeSharp_methods[] = {	
+	{"normalA", ( PyCFunction ) FEdgeSharp_normalA, METH_NOARGS, "() Returns the normal to the face lying on the right of the FEdge. If this FEdge is a border, it has no Face on its right and therefore, no normal."},
+	{"normalB", ( PyCFunction ) FEdgeSharp_normalB, METH_NOARGS, "() Returns the normal to the face lying on the left of the FEdge."},
+	{"aMaterialIndex", ( PyCFunction ) FEdgeSharp_aMaterialIndex, METH_NOARGS, "() Returns the index of the material of the face lying on the right of the FEdge. If this FEdge is a border, it has no Face on its right and therefore, no material. "},
+	{"bMaterialIndex", ( PyCFunction ) FEdgeSharp_bMaterialIndex, METH_NOARGS, "() Returns the material of the face lying on the left of the FEdge. "},
+	{"aMaterial", ( PyCFunction ) FEdgeSharp_aMaterial, METH_NOARGS, "() Returns the material of the face lying on the right of the FEdge. If this FEdge is a border, it has no Face on its right and therefore, no material."},
+	{"bMaterial", ( PyCFunction ) FEdgeSharp_bMaterial, METH_NOARGS, "() Returns the material of the face lying on the left of the FEdge."},
+	{"setNormalA", ( PyCFunction ) FEdgeSharp_setNormalA, METH_VARARGS, "([x,y,z]) Sets the normal to the face lying on the right of the FEdge."},
+	{"setNormalB", ( PyCFunction ) FEdgeSharp_setNormalB, METH_VARARGS, "([x,y,z]) Sets the normal to the face lying on the left of the FEdge. "},
+	{"setaMaterialIndex", ( PyCFunction ) FEdgeSharp_setaMaterialIndex, METH_VARARGS, "(unsigned int i) Sets the index of the material lying on the right of the FEdge. "},
+	{"setbMaterialIndex", ( PyCFunction ) FEdgeSharp_setbMaterialIndex, METH_VARARGS, "(unsigned int i) Sets the index of the material lying on the left of the FEdge. "},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_FEdgeSharp type definition ------------------------------*/
+
+PyTypeObject FEdgeSharp_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"FEdgeSharp",				/* tp_name */
+	sizeof( BPy_FEdgeSharp ),	/* 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_FEdgeSharp_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&FEdge_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)FEdgeSharp___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
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int FEdgeSharp___init__(BPy_FEdgeSharp *self, PyObject *args, PyObject *kwds)
+{
+	PyObject *obj1 = 0, *obj2 = 0;
+
+    if (! PyArg_ParseTuple(args, "|OO", &obj1, &obj2) )
+        return -1;
+
+	if( !obj1 ){
+		self->fes = new FEdgeSharp();
+		
+	} else if( BPy_FEdgeSharp_Check(obj1) ) {
+		if( ((BPy_FEdgeSharp *) obj1)->fes )
+			self->fes = new FEdgeSharp(*( ((BPy_FEdgeSharp *) obj1)->fes ));
+		else
+			return -1;
+		
+	} else if( BPy_SVertex_Check(obj1) && BPy_SVertex_Check(obj2) ) {
+		self->fes = new FEdgeSharp( ((BPy_SVertex *) obj1)->sv, ((BPy_SVertex *) obj2)->sv );
+
+	} else {
+		return -1;
+	}
+
+	self->py_fe.fe = self->fes;
+	self->py_fe.py_if1D.if1D = self->fes;
+
+	return 0;
 }
 
 
- PyObject *_wrap_FEdgeSharp_normalA(PyObject *self , PyObject *args) {
+PyObject * FEdgeSharp_normalA( BPy_FEdgeSharp *self ) {
+	Vec3r v( self->fes->normalA() );
+	return Vector_from_Vec3r( v );
 }
 
-
- PyObject *_wrap_FEdgeSharp_normalB(PyObject *self , PyObject *args) {
+PyObject * FEdgeSharp_normalB( BPy_FEdgeSharp *self ) {
+	Vec3r v( self->fes->normalB() );
+	return Vector_from_Vec3r( v );
 }
 
+PyObject * FEdgeSharp_aMaterialIndex( BPy_FEdgeSharp *self ) {
+	return PyInt_FromLong( self->fes->aMaterialIndex() );
+}
 
- PyObject *_wrap_FEdgeSharp_aMaterialIndex(PyObject *self , PyObject *args) {
+PyObject * FEdgeSharp_bMaterialIndex( BPy_FEdgeSharp *self ) {
+	return PyInt_FromLong( self->fes->bMaterialIndex() );
 }
 
+PyObject * FEdgeSharp_aMaterial( BPy_FEdgeSharp *self ) {
+	Material m( self->fes->aMaterial() );
+	return BPy_FrsMaterial_from_Material(m);
+}
 
- PyObject *_wrap_FEdgeSharp_aMaterial(PyObject *self , PyObject *args) {
+PyObject * FEdgeSharp_bMaterial( BPy_FEdgeSharp *self ) {
+	Material m( self->fes->aMaterial() );
+	return BPy_FrsMaterial_from_Material(m);
 }
 
+PyObject * FEdgeSharp_setNormalA( BPy_FEdgeSharp *self, PyObject *args ) {
+	PyObject *obj = 0;
 
- PyObject *_wrap_FEdgeSharp_bMaterialIndex(PyObject *self , PyObject *args) {
-}
+	if(!( PyArg_ParseTuple(args, "O", &obj) && PyList_Check(obj) && PyList_Size(obj) > 2 )) {
+		cout << "ERROR: FEdgeSharp_setNormalA" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	Vec3r v(	PyFloat_AsDouble( PyList_GetItem(obj,0) ),
+				PyFloat_AsDouble( PyList_GetItem(obj,1) ),
+				PyFloat_AsDouble( PyList_GetItem(obj,2) ) );
 
+	self->fes->setNormalA( v );
 
- PyObject *_wrap_FEdgeSharp_bMaterial(PyObject *self , PyObject *args) {
+	Py_RETURN_NONE;
 }
 
+PyObject * FEdgeSharp_setNormalB( BPy_FEdgeSharp *self, PyObject *args ) {
+	PyObject *obj = 0;
 
- PyObject *_wrap_FEdgeSharp_SetNormalA(PyObject *self , PyObject *args) {
-}
+	if(!( PyArg_ParseTuple(args, "O", &obj) && PyList_Check(obj) && PyList_Size(obj) > 2 )) {
+		cout << "ERROR: FEdgeSharp_setNormalB" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	Vec3r v(	PyFloat_AsDouble( PyList_GetItem(obj,0) ),
+				PyFloat_AsDouble( PyList_GetItem(obj,1) ),
+				PyFloat_AsDouble( PyList_GetItem(obj,2) ) );
 
+	self->fes->setNormalB( v );
 
- PyObject *_wrap_FEdgeSharp_SetNormalB(PyObject *self , PyObject *args) {
+	Py_RETURN_NONE;
 }
 
+PyObject * FEdgeSharp_setaMaterialIndex( BPy_FEdgeSharp *self, PyObject *args ) {
+	unsigned int i;
+
+	if(!( PyArg_ParseTuple(args, "I", &i) )) {
+		cout << "ERROR: FEdgeSharp_setaMaterialIndex" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	self->fes->setaMaterialIndex( i );
 
- PyObject *_wrap_FEdgeSharp_SetaMaterialIndex(PyObject *self , PyObject *args) {
+	Py_RETURN_NONE;
 }
 
+PyObject * FEdgeSharp_setbMaterialIndex( BPy_FEdgeSharp *self, PyObject *args ) {
+	unsigned int i;
 
- PyObject *_wrap_FEdgeSharp_SetbMaterialIndex(PyObject *self , PyObject *args) {
+	if(!( PyArg_ParseTuple(args, "I", &i) )) {
+		cout << "ERROR: FEdgeSharp_setbMaterialIndex" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	self->fes->setbMaterialIndex( i );
+
+	Py_RETURN_NONE;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h
new file mode 100644
index 00000000000..d08ef006941
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_FEDGESHARP_H
+#define FREESTYLE_PYTHON_FEDGESHARP_H
+
+#include "../BPy_FEdge.h"
+#include "../../../view_map/Silhouette.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject FEdgeSharp_Type;
+
+#define BPy_FEdgeSharp_Check(v)	(( (PyObject *) v)->ob_type == &FEdgeSharp_Type)
+
+/*---------------------------Python BPy_FEdgeSharp structure definition----------*/
+typedef struct {
+	BPy_FEdge py_fe;
+	FEdgeSharp *fes;
+} BPy_FEdgeSharp;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_FEDGESHARP_H */
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
index e453bbdc863..6a11b6c1e98 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
@@ -1,32 +1,198 @@
- PyObject *_wrap_FEdgeSmooth_dupplicate(PyObject *self , PyObject *args) {
+#include "BPy_FEdgeSmooth.h"
+
+#include "../../BPy_Convert.h"
+#include "../../Interface0D/BPy_SVertex.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for FEdgeSmooth instance  -----------*/
+static int FEdgeSmooth___init__(BPy_FEdgeSmooth *self, PyObject *args, PyObject *kwds);
+
+static PyObject * FEdgeSmooth_normal( BPy_FEdgeSmooth *self ) ;
+static PyObject * FEdgeSmooth_materialIndex( BPy_FEdgeSmooth *self ) ;
+static PyObject * FEdgeSmooth_material( BPy_FEdgeSmooth *self );
+static PyObject * FEdgeSmooth_setNormal( BPy_FEdgeSmooth *self, PyObject *args );
+static PyObject * FEdgeSmooth_setMaterialIndex( BPy_FEdgeSmooth *self, PyObject *args );
+
+
+/*----------------------FEdgeSmooth instance definitions ----------------------------*/
+static PyMethodDef BPy_FEdgeSmooth_methods[] = {	
+	{"normal", ( PyCFunction ) FEdgeSmooth_normal, METH_NOARGS, "() Returns the normal to the Face it is running accross."},
+	{"materialIndex", ( PyCFunction ) FEdgeSmooth_materialIndex, METH_NOARGS, "() Returns the index of the material of the face it is running accross. "},
+	{"aMaterial", ( PyCFunction ) FEdgeSmooth_material, METH_NOARGS, "() Returns the material of the face it is running accross. "},
+	{"setNormalA", ( PyCFunction ) FEdgeSmooth_setNormal, METH_VARARGS, "([x,y,z]) Sets the normal to the Face it is running accross."},
+	{"setaMaterialIndex", ( PyCFunction ) FEdgeSmooth_setMaterialIndex, METH_VARARGS, "(unsigned int i) Sets the index of the material of the face it is running accross. "},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_FEdgeSmooth type definition ------------------------------*/
+
+PyTypeObject FEdgeSmooth_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"FEdgeSmooth",				/* tp_name */
+	sizeof( BPy_FEdgeSmooth ),	/* 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_FEdgeSmooth_methods,	/* struct PyMethodDef *tp_methods; */
+	NULL,                       	/* struct PyMemberDef *tp_members; */
+	NULL,         					/* struct PyGetSetDef *tp_getset; */
+	&FEdge_Type,				/* struct _typeobject *tp_base; */
+	NULL,							/* PyObject *tp_dict; */
+	NULL,							/* descrgetfunc tp_descr_get; */
+	NULL,							/* descrsetfunc tp_descr_set; */
+	0,                          	/* long tp_dictoffset; */
+	(initproc)FEdgeSmooth___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
+};
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+
+int FEdgeSmooth___init__(BPy_FEdgeSmooth *self, PyObject *args, PyObject *kwds)
+{
+	PyObject *obj1 = 0, *obj2 = 0;
+
+    if (! PyArg_ParseTuple(args, "|OO", &obj1, &obj2) )
+        return -1;
+
+	if( !obj1 ){
+		self->fes = new FEdgeSmooth();
+		
+	} else if( BPy_FEdgeSmooth_Check(obj1) ) {
+		if( ((BPy_FEdgeSmooth *) obj1)->fes )
+			self->fes = new FEdgeSmooth(*( ((BPy_FEdgeSmooth *) obj1)->fes ));
+		else
+			return -1;
+		
+	} else if( BPy_SVertex_Check(obj1) && BPy_SVertex_Check(obj2) ) {
+		self->fes = new FEdgeSmooth( ((BPy_SVertex *) obj1)->sv, ((BPy_SVertex *) obj2)->sv );
+
+	} else {
+		return -1;
+	}
+
+	self->py_fe.fe = self->fes;
+	self->py_fe.py_if1D.if1D = self->fes;
+
+	return 0;
 }
 
-
- PyObject *_wrap_FEdgeSmooth_face(PyObject *self , PyObject *args) {
+PyObject * FEdgeSmooth_normal( BPy_FEdgeSmooth *self ) {
+	Vec3r v( self->fes->normal() );
+	return Vector_from_Vec3r( v );
 }
 
-
- PyObject *_wrap_FEdgeSmooth_normal(PyObject *self , PyObject *args) {
+PyObject * FEdgeSmooth_materialIndex( BPy_FEdgeSmooth *self ) {
+	return PyInt_FromLong( self->fes->materialIndex() );
 }
 
 
- PyObject *_wrap_FEdgeSmooth_materialIndex(PyObject *self , PyObject *args) {
+PyObject * FEdgeSmooth_material( BPy_FEdgeSmooth *self ) {
+	Material m( self->fes->material() );
+	return BPy_FrsMaterial_from_Material(m);
 }
 
+PyObject * FEdgeSmooth_setNormal( BPy_FEdgeSmooth *self, PyObject *args ) {
+	PyObject *obj = 0;
 
- PyObject *_wrap_FEdgeSmooth_material(PyObject *self , PyObject *args) {
-}
+	if(!( PyArg_ParseTuple(args, "O", &obj) && PyList_Check(obj) && PyList_Size(obj) > 2 )) {
+		cout << "ERROR: FEdgeSmooth_setNormal" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	Vec3r v(	PyFloat_AsDouble( PyList_GetItem(obj,0) ),
+				PyFloat_AsDouble( PyList_GetItem(obj,1) ),
+				PyFloat_AsDouble( PyList_GetItem(obj,2) ) );
 
+	self->fes->setNormal( v );
 
- PyObject *_wrap_FEdgeSmooth_SetFace(PyObject *self , PyObject *args) {
+	Py_RETURN_NONE;
 }
 
+PyObject * FEdgeSmooth_setMaterialIndex( BPy_FEdgeSmooth *self, PyObject *args ) {
+	unsigned int i;
 
- PyObject *_wrap_FEdgeSmooth_SetNormal(PyObject *self , PyObject *args) {
-}
-
+	if(!( PyArg_ParseTuple(args, "I", &i) )) {
+		cout << "ERROR: FEdgeSmooth_setMaterialIndex" << endl;
+		Py_RETURN_NONE;
+	}
+	
+	self->fes->setMaterialIndex( i );
 
- PyObject *_wrap_FEdgeSmooth_SetMaterialIndex(PyObject *self , PyObject *args) {
+	Py_RETURN_NONE;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////
 
+#ifdef __cplusplus
+}
+#endif
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h
new file mode 100644
index 00000000000..6b26f65d81c
--- /dev/null
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h
@@ -0,0 +1,31 @@
+#ifndef FREESTYLE_PYTHON_FEDGESMOOTH_H
+#define FREESTYLE_PYTHON_FEDGESMOOTH_H
+
+#include "../BPy_FEdge.h"
+#include "../../../view_map/Silhouette.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject FEdgeSmooth_Type;
+
+#define BPy_FEdgeSmooth_Check(v)	(( (PyObject *) v)->ob_type == &FEdgeSmooth_Type)
+
+/*---------------------------Python BPy_FEdgeSmooth structure definition----------*/
+typedef struct {
+	BPy_FEdge py_fe;
+	FEdgeSmooth *fes;
+} BPy_FEdgeSmooth;
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_FEDGESMOOTH_H */