soc-2008-mxcurioni: moved namespace collision resolution to the freestyle_init.py (for Curve, Material and Noise)

9 files changed, 424 insertions, 424 deletions

diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index 0b136b7702f..13e4f332c32 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -1,7 +1,7 @@
 #include "BPy_Convert.h"
 
 #include "BPy_BBox.h"
-#include "BPy_FrsMaterial.h"
+#include "BPy_Material.h"
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
 #include "BPy_Interface0D.h"
@@ -188,9 +188,9 @@ PyObject * BPy_ViewShape_from_ViewShape( ViewShape& vs ) {
 	return py_vs;
 }
 
-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 );
+PyObject * BPy_Material_from_Material( Material& m ){
+	PyObject *py_m = Material_Type.tp_new( &Material_Type, 0, 0 );
+	((BPy_Material*) 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 4bfaf4c1e17..54999b44f67 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.h
+++ b/source/blender/freestyle/intern/python/BPy_Convert.h
@@ -76,7 +76,7 @@ PyObject * BPy_Id_from_Id( Id& id );
 PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
 PyObject * BPy_Interface1D_from_Interface1D( Interface1D& if1D );
 PyObject * BPy_IntegrationType_from_IntegrationType( int i );
-PyObject * BPy_FrsMaterial_from_Material( Material& m );
+PyObject * BPy_Material_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 85a2783102e..6348d30577c 100644
--- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
@@ -3,7 +3,7 @@
 #include "BPy_BBox.h"
 #include "BPy_BinaryPredicate0D.h"
 #include "BPy_BinaryPredicate1D.h"
-#include "BPy_FrsMaterial.h"
+#include "BPy_Material.h"
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
 #include "BPy_Interface0D.h"
@@ -147,7 +147,7 @@ PyObject *Freestyle_Init( void )
 	BBox_Init( module );
 	BinaryPredicate0D_Init( module );
 	BinaryPredicate1D_Init( module );
-	FrsMaterial_Init( module );
+	Material_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
deleted file mode 100644
index 052583e4621..00000000000
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
+++ /dev/null
@@ -1,407 +0,0 @@
-#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_Material.cpp b/source/blender/freestyle/intern/python/BPy_Material.cpp
new file mode 100644
index 00000000000..7f871c34c3c
--- /dev/null
+++ b/source/blender/freestyle/intern/python/BPy_Material.cpp
@@ -0,0 +1,407 @@
+#include "BPy_Material.h"
+
+#include "BPy_Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*---------------  Python API function prototypes for Material instance  -----------*/
+static int Material___init__(BPy_Material *self, PyObject *args, PyObject *kwds);
+static void Material___dealloc__(BPy_Material *self);
+static PyObject * Material___repr__(BPy_Material *self);
+
+static PyObject * Material_diffuse( BPy_Material* self);
+static PyObject * Material_diffuseR( BPy_Material* self);
+static PyObject * Material_diffuseG( BPy_Material* self) ;
+static PyObject * Material_diffuseB( BPy_Material* self) ;
+static PyObject * Material_diffuseA( BPy_Material* self);
+static PyObject * Material_specular( BPy_Material* self);
+static PyObject * Material_specularR( BPy_Material* self);
+static PyObject * Material_specularG( BPy_Material* self);
+static PyObject * Material_specularB( BPy_Material* self) ;
+static PyObject * Material_specularA( BPy_Material* self) ;
+static PyObject * Material_ambient( BPy_Material* self) ;
+static PyObject * Material_ambientR( BPy_Material* self);
+static PyObject * Material_ambientG( BPy_Material* self);
+static PyObject * Material_ambientB( BPy_Material* self);
+static PyObject * Material_ambientA( BPy_Material* self);
+static PyObject * Material_emission( BPy_Material* self);
+static PyObject * Material_emissionR( BPy_Material* self);
+static PyObject * Material_emissionG( BPy_Material* self) ;
+static PyObject * Material_emissionB( BPy_Material* self);
+static PyObject * Material_emissionA( BPy_Material* self);
+static PyObject * Material_shininess( BPy_Material* self);
+static PyObject * Material_setDiffuse( BPy_Material *self, PyObject *args );
+static PyObject * Material_setSpecular( BPy_Material *self, PyObject *args );
+static PyObject * Material_setAmbient( BPy_Material *self, PyObject *args );
+static PyObject * Material_setEmission( BPy_Material *self, PyObject *args );
+static PyObject * Material_setShininess( BPy_Material *self, PyObject *args );
+
+/*----------------------Material instance definitions ----------------------------*/
+static PyMethodDef BPy_Material_methods[] = {
+	{"diffuse", ( PyCFunction ) Material_diffuse, METH_NOARGS, "() Returns the diffuse color as a 4 float array"},
+	{"diffuseR", ( PyCFunction ) Material_diffuseR, METH_NOARGS, "() Returns the red component of the diffuse color "},
+	{"diffuseG", ( PyCFunction ) Material_diffuseG, METH_NOARGS, "() Returns the green component of the diffuse color "},
+	{"diffuseB", ( PyCFunction ) Material_diffuseB, METH_NOARGS, "() Returns the blue component of the diffuse color "},
+	{"diffuseA", ( PyCFunction ) Material_diffuseA, METH_NOARGS, "() Returns the alpha component of the diffuse color "},
+	{"specular", ( PyCFunction ) Material_specular, METH_NOARGS, "() Returns the specular color as a 4 float array"},
+	{"specularR", ( PyCFunction ) Material_specularR, METH_NOARGS, "() Returns the red component of the specular color "},
+	{"specularG", ( PyCFunction ) Material_specularG, METH_NOARGS, "() Returns the green component of the specular color "},
+	{"specularB", ( PyCFunction ) Material_specularB, METH_NOARGS, "() Returns the blue component of the specular color "},
+	{"specularA", ( PyCFunction ) Material_specularA, METH_NOARGS, "() Returns the alpha component of the specular color "},
+	{"ambient", ( PyCFunction ) Material_ambient, METH_NOARGS, "() Returns the ambient color as a 4 float array"},
+	{"ambientR", ( PyCFunction ) Material_ambientR, METH_NOARGS, "() Returns the red component of the ambient color "},
+	{"ambientG", ( PyCFunction ) Material_ambientG, METH_NOARGS, "() Returns the green component of the ambient color "},
+	{"ambientB", ( PyCFunction ) Material_ambientB, METH_NOARGS, "() Returns the blue component of the ambient color "},
+	{"ambientA", ( PyCFunction ) Material_ambientA, METH_NOARGS, "() Returns the alpha component of the ambient color "},
+	{"emission", ( PyCFunction ) Material_emission, METH_NOARGS, "() Returns the emission color as a 4 float array"},
+	{"emissionR", ( PyCFunction ) Material_emissionR, METH_NOARGS, "() Returns the red component of the emission color "},
+	{"emissionG", ( PyCFunction ) Material_emissionG, METH_NOARGS, "() Returns the green component of the emission color "},
+	{"emissionB", ( PyCFunction ) Material_emissionB, METH_NOARGS, "() Returns the blue component of the emission color "},
+	{"emissionA", ( PyCFunction ) Material_emissionA, METH_NOARGS, "() Returns the alpha component of the emission color "},
+	{"shininess", ( PyCFunction ) Material_shininess, METH_NOARGS, "() Returns the shininess coefficient "},
+	{"setDiffuse", ( PyCFunction ) Material_setDiffuse, METH_NOARGS, "(float r, float g, float b, float a) Sets the diffuse color"},
+	{"setSpecular", ( PyCFunction ) Material_setSpecular, METH_NOARGS, "(float r, float g, float b, float a) Sets the specular color"},
+	{"setAmbient", ( PyCFunction ) Material_setAmbient, METH_NOARGS, "(float r, float g, float b, float a) Sets the ambient color"},
+	{"setEmission", ( PyCFunction ) Material_setEmission, METH_NOARGS, "(float r, float g, float b, float a) Sets the emission color"},
+	{"setShininess", ( PyCFunction ) Material_setShininess, METH_NOARGS, "(float r, float g, float b, float a) Sets the shininess color"},
+	{NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_Material type definition ------------------------------*/
+
+PyTypeObject Material_Type = {
+	PyObject_HEAD_INIT( NULL ) 
+	0,							/* ob_size */
+	"Material",				/* tp_name */
+	sizeof( BPy_Material ),	/* tp_basicsize */
+	0,							/* tp_itemsize */
+	
+	/* methods */
+	(destructor)Material___dealloc__,	/* tp_dealloc */
+	NULL,                       				/* printfunc tp_print; */
+	NULL,                       				/* getattrfunc tp_getattr; */
+	NULL,                       				/* setattrfunc tp_setattr; */
+	NULL,										/* tp_compare */
+	(reprfunc)Material___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_Material_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)Material___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 Material_Init( PyObject *module )
+{
+	if( module == NULL )
+		return;
+
+	if( PyType_Ready( &Material_Type ) < 0 )
+		return;
+
+	Py_INCREF( &Material_Type );
+	PyModule_AddObject(module, "Material", (PyObject *)&Material_Type);
+}
+
+//------------------------INSTANCE METHODS ----------------------------------
+
+int Material___init__(BPy_Material *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_Material_Check(obj1) ) {
+		if( ((BPy_Material *) obj1)->m )
+			self->m = new Material(*( ((BPy_Material *) 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 Material___dealloc__( BPy_Material* self)
+{
+	delete self->m;
+    self->ob_type->tp_free((PyObject*)self);
+}
+
+
+PyObject * Material___repr__( BPy_Material* self)
+{
+    return PyString_FromFormat("Material - address: %p", self->m );
+}
+
+PyObject * Material_diffuse( BPy_Material* 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 * Material_diffuseR( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->diffuseR() );
+}
+
+PyObject * Material_diffuseG( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->diffuseG() );
+}
+
+PyObject * Material_diffuseB( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->diffuseB() );
+}
+
+PyObject * Material_diffuseA( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->diffuseA() );
+}
+
+PyObject * Material_specular( BPy_Material* 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 * Material_specularR( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->specularR() );
+}
+
+PyObject * Material_specularG( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->specularG() );
+}
+
+PyObject * Material_specularB( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->specularB() );
+}
+
+PyObject * Material_specularA( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->specularA() );
+}
+
+PyObject * Material_ambient( BPy_Material* 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 * Material_ambientR( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->ambientR() );
+}
+
+PyObject * Material_ambientG( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->ambientG() );
+}
+
+PyObject * Material_ambientB( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->ambientB() );
+}
+
+PyObject * Material_ambientA( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->ambientA() );
+}
+
+PyObject * Material_emission( BPy_Material* 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 * Material_emissionR( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->emissionR() );
+}
+
+PyObject * Material_emissionG( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->emissionG() );
+}
+
+PyObject * Material_emissionB( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->emissionB() );
+}
+
+PyObject * Material_emissionA( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->emissionA() );
+}
+
+PyObject * Material_shininess( BPy_Material* self) {
+	return PyFloat_FromDouble( self->m->shininess() );
+}
+
+PyObject * Material_setDiffuse( BPy_Material *self, PyObject *args ) {
+	float f1, f2, f3, f4;
+
+	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
+		cout << "ERROR: Material_setDiffuse" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->m->setDiffuse(f1, f2, f3, f4);
+
+	Py_RETURN_NONE;
+}
+ 
+PyObject * Material_setSpecular( BPy_Material *self, PyObject *args ) {
+	float f1, f2, f3, f4;
+
+	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
+		cout << "ERROR: Material_setSpecular" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->m->setSpecular(f1, f2, f3, f4);
+
+	Py_RETURN_NONE;
+}
+
+PyObject * Material_setAmbient( BPy_Material *self, PyObject *args ) {
+	float f1, f2, f3, f4;
+
+	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
+		cout << "ERROR: Material_setAmbient" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->m->setAmbient(f1, f2, f3, f4);
+
+	Py_RETURN_NONE;
+}
+
+PyObject * Material_setEmission( BPy_Material *self, PyObject *args ) {
+	float f1, f2, f3, f4;
+
+	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
+		cout << "ERROR: Material_setEmission" << endl;
+		Py_RETURN_NONE;
+	}
+
+	self->m->setEmission(f1, f2, f3, f4);
+
+	Py_RETURN_NONE;
+}
+
+PyObject * Material_setShininess( BPy_Material *self, PyObject *args ) {
+	float f;
+
+	if(!( PyArg_ParseTuple(args, "f", &f)  )) {
+		cout << "ERROR: Material_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_Material.h
index cb1aa20bb21..e1c31864b63 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
+++ b/source/blender/freestyle/intern/python/BPy_Material.h
@@ -11,19 +11,19 @@ extern "C" {
 
 #include <Python.h>
 
-extern PyTypeObject FrsMaterial_Type;
+extern PyTypeObject Material_Type;
 
-#define BPy_FrsMaterial_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FrsMaterial_Type)  )
+#define BPy_Material_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Material_Type)  )
 
-/*---------------------------Python BPy_FrsMaterial structure definition----------*/
+/*---------------------------Python BPy_Material structure definition----------*/
 typedef struct {
 	PyObject_HEAD
 	Material *m;
-} BPy_FrsMaterial;
+} BPy_Material;
 
-/*---------------------------Python BPy_FrsMaterial visible prototypes-----------*/
+/*---------------------------Python BPy_Material visible prototypes-----------*/
 
-PyMODINIT_FUNC FrsMaterial_Init( PyObject *module );
+PyMODINIT_FUNC Material_Init( PyObject *module );
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
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 22a4dbc378e..8911cc7f290 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
@@ -175,12 +175,12 @@ PyObject * FEdgeSharp_bMaterialIndex( BPy_FEdgeSharp *self ) {
 
 PyObject * FEdgeSharp_aMaterial( BPy_FEdgeSharp *self ) {
 	Material m( self->fes->aMaterial() );
-	return BPy_FrsMaterial_from_Material(m);
+	return BPy_Material_from_Material(m);
 }
 
 PyObject * FEdgeSharp_bMaterial( BPy_FEdgeSharp *self ) {
 	Material m( self->fes->aMaterial() );
-	return BPy_FrsMaterial_from_Material(m);
+	return BPy_Material_from_Material(m);
 }
 
 PyObject * FEdgeSharp_setNormalA( BPy_FEdgeSharp *self, PyObject *args ) {
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 6a11b6c1e98..52b501e0746 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
@@ -158,7 +158,7 @@ PyObject * FEdgeSmooth_materialIndex( BPy_FEdgeSmooth *self ) {
 
 PyObject * FEdgeSmooth_material( BPy_FEdgeSmooth *self ) {
 	Material m( self->fes->material() );
-	return BPy_FrsMaterial_from_Material(m);
+	return BPy_Material_from_Material(m);
 }
 
 PyObject * FEdgeSmooth_setNormal( BPy_FEdgeSmooth *self, PyObject *args ) {
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
index 733acce6ab8..f524eb25352 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
@@ -165,7 +165,7 @@ PyObject * UnaryFunction0DMaterial___call__( BPy_UnaryFunction0DMaterial *self,
 	}
 	
 	Material m( self->uf0D_material->operator()(*( ((BPy_Interface0DIterator *) obj)->if0D_it )) );
-	return BPy_FrsMaterial_from_Material( m );
+	return BPy_Material_from_Material( m );
 
 }