soc-2008-mxcurioni: clean-up #2

10 files changed, 140 insertions, 137 deletions

diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index 53a4e171e74..e7d98440683 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_Material.h"
+#include "BPy_FrsMaterial.h"
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
 #include "BPy_Interface0D.h"
@@ -190,9 +190,9 @@ PyObject * BPy_ViewShape_from_ViewShape( ViewShape& vs ) {
 	return py_vs;
 }
 
-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 );
+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 54999b44f67..4bfaf4c1e17 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_Material_from_Material( Material& m );
+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 b4170dc4f92..8c55fdc3fd0 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_Material.h"
+#include "BPy_FrsMaterial.h"
 #include "BPy_FrsNoise.h"
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
@@ -147,7 +147,7 @@ PyObject *Freestyle_Init( void )
 	BBox_Init( module );
 	BinaryPredicate0D_Init( module );
 	BinaryPredicate1D_Init( module );
-	Material_Init( module );
+	FrsMaterial_Init( module );
 	FrsNoise_Init( module );
 	Id_Init( module );
 	IntegrationType_Init( module );
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
index 7f871c34c3c..052583e4621 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
@@ -1,4 +1,4 @@
-#include "BPy_Material.h"
+#include "BPy_FrsMaterial.h"
 
 #include "BPy_Convert.h"
 
@@ -8,85 +8,85 @@ extern "C" {
 
 ///////////////////////////////////////////////////////////////////////////////////////////
 
-/*---------------  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"},
+/*---------------  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_Material type definition ------------------------------*/
+/*-----------------------BPy_FrsMaterial type definition ------------------------------*/
 
-PyTypeObject Material_Type = {
+PyTypeObject FrsMaterial_Type = {
 	PyObject_HEAD_INIT( NULL ) 
 	0,							/* ob_size */
-	"Material",				/* tp_name */
-	sizeof( BPy_Material ),	/* tp_basicsize */
+	"FrsMaterial",				/* tp_name */
+	sizeof( BPy_FrsMaterial ),	/* tp_basicsize */
 	0,							/* tp_itemsize */
 	
 	/* methods */
-	(destructor)Material___dealloc__,	/* tp_dealloc */
+	(destructor)FrsMaterial___dealloc__,	/* tp_dealloc */
 	NULL,                       				/* printfunc tp_print; */
 	NULL,                       				/* getattrfunc tp_getattr; */
 	NULL,                       				/* setattrfunc tp_setattr; */
 	NULL,										/* tp_compare */
-	(reprfunc)Material___repr__,					/* tp_repr */
+	(reprfunc)FrsMaterial___repr__,					/* tp_repr */
 
 	/* Method suites for standard classes */
 
@@ -129,7 +129,7 @@ PyTypeObject Material_Type = {
 	NULL,                       /* iternextfunc tp_iternext; */
 
   /*** Attribute descriptor and subclassing stuff ***/
-	BPy_Material_methods,	/* struct PyMethodDef *tp_methods; */
+	BPy_FrsMaterial_methods,	/* struct PyMethodDef *tp_methods; */
 	NULL,                       	/* struct PyMemberDef *tp_members; */
 	NULL,         					/* struct PyGetSetDef *tp_getset; */
 	NULL,							/* struct _typeobject *tp_base; */
@@ -137,7 +137,7 @@ PyTypeObject Material_Type = {
 	NULL,							/* descrgetfunc tp_descr_get; */
 	NULL,							/* descrsetfunc tp_descr_set; */
 	0,                          	/* long tp_dictoffset; */
-	(initproc)Material___init__, /* initproc tp_init; */
+	(initproc)FrsMaterial___init__, /* initproc tp_init; */
 	NULL,							/* allocfunc tp_alloc; */
 	PyType_GenericNew,		/* newfunc tp_new; */
 	
@@ -157,21 +157,21 @@ PyTypeObject Material_Type = {
 };
 
 //-------------------MODULE INITIALIZATION--------------------------------
-PyMODINIT_FUNC Material_Init( PyObject *module )
+PyMODINIT_FUNC FrsMaterial_Init( PyObject *module )
 {
 	if( module == NULL )
 		return;
 
-	if( PyType_Ready( &Material_Type ) < 0 )
+	if( PyType_Ready( &FrsMaterial_Type ) < 0 )
 		return;
 
-	Py_INCREF( &Material_Type );
-	PyModule_AddObject(module, "Material", (PyObject *)&Material_Type);
+	Py_INCREF( &FrsMaterial_Type );
+	PyModule_AddObject(module, "FrsMaterial", (PyObject *)&FrsMaterial_Type);
 }
 
 //------------------------INSTANCE METHODS ----------------------------------
 
-int Material___init__(BPy_Material *self, PyObject *args, PyObject *kwds)
+int FrsMaterial___init__(BPy_FrsMaterial *self, PyObject *args, PyObject *kwds)
 {
 	PyObject *obj1 = 0;
 	float f1 = 0, f2 = 0., f3 = 0., f4 = 0., f5 = 0.;
@@ -182,9 +182,9 @@ int Material___init__(BPy_Material *self, PyObject *args, PyObject *kwds)
 	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 if( BPy_FrsMaterial_Check(obj1) ) {
+		if( ((BPy_FrsMaterial *) obj1)->m )
+			self->m = new Material(*( ((BPy_FrsMaterial *) obj1)->m ));
 		else
 			return -1;
 
@@ -199,19 +199,19 @@ int Material___init__(BPy_Material *self, PyObject *args, PyObject *kwds)
 	return 0;
 }
 
-void Material___dealloc__( BPy_Material* self)
+void FrsMaterial___dealloc__( BPy_FrsMaterial* self)
 {
 	delete self->m;
     self->ob_type->tp_free((PyObject*)self);
 }
 
 
-PyObject * Material___repr__( BPy_Material* self)
+PyObject * FrsMaterial___repr__( BPy_FrsMaterial* self)
 {
-    return PyString_FromFormat("Material - address: %p", self->m );
+    return PyString_FromFormat("FrsMaterial - address: %p", self->m );
 }
 
-PyObject * Material_diffuse( BPy_Material* self) {
+PyObject * FrsMaterial_diffuse( BPy_FrsMaterial* self) {
 	PyObject *tmp;
 	
 	const float *diffuse = self->m->diffuse();
@@ -225,23 +225,23 @@ PyObject * Material_diffuse( BPy_Material* self) {
 	return py_diffuse;
 }
 
-PyObject * Material_diffuseR( BPy_Material* self) {
+PyObject * FrsMaterial_diffuseR( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->diffuseR() );
 }
 
-PyObject * Material_diffuseG( BPy_Material* self) {
+PyObject * FrsMaterial_diffuseG( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->diffuseG() );
 }
 
-PyObject * Material_diffuseB( BPy_Material* self) {
+PyObject * FrsMaterial_diffuseB( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->diffuseB() );
 }
 
-PyObject * Material_diffuseA( BPy_Material* self) {
+PyObject * FrsMaterial_diffuseA( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->diffuseA() );
 }
 
-PyObject * Material_specular( BPy_Material* self) {
+PyObject * FrsMaterial_specular( BPy_FrsMaterial* self) {
 	PyObject *tmp;
 	
 	const float *specular = self->m->specular();
@@ -255,23 +255,23 @@ PyObject * Material_specular( BPy_Material* self) {
 	return py_specular;
 }
 
-PyObject * Material_specularR( BPy_Material* self) {
+PyObject * FrsMaterial_specularR( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->specularR() );
 }
 
-PyObject * Material_specularG( BPy_Material* self) {
+PyObject * FrsMaterial_specularG( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->specularG() );
 }
 
-PyObject * Material_specularB( BPy_Material* self) {
+PyObject * FrsMaterial_specularB( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->specularB() );
 }
 
-PyObject * Material_specularA( BPy_Material* self) {
+PyObject * FrsMaterial_specularA( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->specularA() );
 }
 
-PyObject * Material_ambient( BPy_Material* self) {
+PyObject * FrsMaterial_ambient( BPy_FrsMaterial* self) {
 	PyObject *tmp;
 	
 	const float *ambient = self->m->ambient();
@@ -285,23 +285,23 @@ PyObject * Material_ambient( BPy_Material* self) {
 	return py_ambient;
 }
 
-PyObject * Material_ambientR( BPy_Material* self) {
+PyObject * FrsMaterial_ambientR( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->ambientR() );
 }
 
-PyObject * Material_ambientG( BPy_Material* self) {
+PyObject * FrsMaterial_ambientG( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->ambientG() );
 }
 
-PyObject * Material_ambientB( BPy_Material* self) {
+PyObject * FrsMaterial_ambientB( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->ambientB() );
 }
 
-PyObject * Material_ambientA( BPy_Material* self) {
+PyObject * FrsMaterial_ambientA( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->ambientA() );
 }
 
-PyObject * Material_emission( BPy_Material* self) {
+PyObject * FrsMaterial_emission( BPy_FrsMaterial* self) {
 	PyObject *tmp;
 	
 	const float *emission = self->m->emission();
@@ -315,31 +315,31 @@ PyObject * Material_emission( BPy_Material* self) {
 	return py_emission;
 }
 
-PyObject * Material_emissionR( BPy_Material* self) {
+PyObject * FrsMaterial_emissionR( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->emissionR() );
 }
 
-PyObject * Material_emissionG( BPy_Material* self) {
+PyObject * FrsMaterial_emissionG( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->emissionG() );
 }
 
-PyObject * Material_emissionB( BPy_Material* self) {
+PyObject * FrsMaterial_emissionB( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->emissionB() );
 }
 
-PyObject * Material_emissionA( BPy_Material* self) {
+PyObject * FrsMaterial_emissionA( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->emissionA() );
 }
 
-PyObject * Material_shininess( BPy_Material* self) {
+PyObject * FrsMaterial_shininess( BPy_FrsMaterial* self) {
 	return PyFloat_FromDouble( self->m->shininess() );
 }
 
-PyObject * Material_setDiffuse( BPy_Material *self, PyObject *args ) {
+PyObject * FrsMaterial_setDiffuse( BPy_FrsMaterial *self, PyObject *args ) {
 	float f1, f2, f3, f4;
 
 	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
-		cout << "ERROR: Material_setDiffuse" << endl;
+		cout << "ERROR: FrsMaterial_setDiffuse" << endl;
 		Py_RETURN_NONE;
 	}
 
@@ -348,11 +348,11 @@ PyObject * Material_setDiffuse( BPy_Material *self, PyObject *args ) {
 	Py_RETURN_NONE;
 }
  
-PyObject * Material_setSpecular( BPy_Material *self, PyObject *args ) {
+PyObject * FrsMaterial_setSpecular( BPy_FrsMaterial *self, PyObject *args ) {
 	float f1, f2, f3, f4;
 
 	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
-		cout << "ERROR: Material_setSpecular" << endl;
+		cout << "ERROR: FrsMaterial_setSpecular" << endl;
 		Py_RETURN_NONE;
 	}
 
@@ -361,11 +361,11 @@ PyObject * Material_setSpecular( BPy_Material *self, PyObject *args ) {
 	Py_RETURN_NONE;
 }
 
-PyObject * Material_setAmbient( BPy_Material *self, PyObject *args ) {
+PyObject * FrsMaterial_setAmbient( BPy_FrsMaterial *self, PyObject *args ) {
 	float f1, f2, f3, f4;
 
 	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
-		cout << "ERROR: Material_setAmbient" << endl;
+		cout << "ERROR: FrsMaterial_setAmbient" << endl;
 		Py_RETURN_NONE;
 	}
 
@@ -374,11 +374,11 @@ PyObject * Material_setAmbient( BPy_Material *self, PyObject *args ) {
 	Py_RETURN_NONE;
 }
 
-PyObject * Material_setEmission( BPy_Material *self, PyObject *args ) {
+PyObject * FrsMaterial_setEmission( BPy_FrsMaterial *self, PyObject *args ) {
 	float f1, f2, f3, f4;
 
 	if(!( PyArg_ParseTuple(args, "ffff", &f1, &f2, &f3, &f4)  )) {
-		cout << "ERROR: Material_setEmission" << endl;
+		cout << "ERROR: FrsMaterial_setEmission" << endl;
 		Py_RETURN_NONE;
 	}
 
@@ -387,11 +387,11 @@ PyObject * Material_setEmission( BPy_Material *self, PyObject *args ) {
 	Py_RETURN_NONE;
 }
 
-PyObject * Material_setShininess( BPy_Material *self, PyObject *args ) {
+PyObject * FrsMaterial_setShininess( BPy_FrsMaterial *self, PyObject *args ) {
 	float f;
 
 	if(!( PyArg_ParseTuple(args, "f", &f)  )) {
-		cout << "ERROR: Material_setShininess" << endl;
+		cout << "ERROR: FrsMaterial_setShininess" << endl;
 		Py_RETURN_NONE;
 	}
 
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
index e1c31864b63..b25ddfc77bc 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
@@ -1,5 +1,5 @@
-#ifndef FREESTYLE_PYTHON_MATERIAL_H
-#define FREESTYLE_PYTHON_MATERIAL_H
+#ifndef FREESTYLE_PYTHON_FRSMATERIAL_H
+#define FREESTYLE_PYTHON_FRSMATERIAL_H
 
 #include "../scene_graph/Material.h"
 
@@ -11,19 +11,19 @@ extern "C" {
 
 #include <Python.h>
 
-extern PyTypeObject Material_Type;
+extern PyTypeObject FrsMaterial_Type;
 
-#define BPy_Material_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &Material_Type)  )
+#define BPy_FrsMaterial_Check(v)	(  PyObject_IsInstance( (PyObject *) v, (PyObject *) &FrsMaterial_Type)  )
 
-/*---------------------------Python BPy_Material structure definition----------*/
+/*---------------------------Python BPy_FrsMaterial structure definition----------*/
 typedef struct {
 	PyObject_HEAD
 	Material *m;
-} BPy_Material;
+} BPy_FrsMaterial;
 
-/*---------------------------Python BPy_Material visible prototypes-----------*/
+/*---------------------------Python BPy_FrsMaterial visible prototypes-----------*/
 
-PyMODINIT_FUNC Material_Init( PyObject *module );
+PyMODINIT_FUNC FrsMaterial_Init( PyObject *module );
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -33,4 +33,4 @@ PyMODINIT_FUNC Material_Init( PyObject *module );
 #endif
 
 
-#endif /* FREESTYLE_PYTHON_MATERIAL_H */
+#endif /* FREESTYLE_PYTHON_FRSMATERIAL_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 8911cc7f290..22a4dbc378e 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_Material_from_Material(m);
+	return BPy_FrsMaterial_from_Material(m);
 }
 
 PyObject * FEdgeSharp_bMaterial( BPy_FEdgeSharp *self ) {
 	Material m( self->fes->aMaterial() );
-	return BPy_Material_from_Material(m);
+	return BPy_FrsMaterial_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 52b501e0746..6a11b6c1e98 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_Material_from_Material(m);
+	return BPy_FrsMaterial_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 f524eb25352..733acce6ab8 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_Material_from_Material( m );
+	return BPy_FrsMaterial_from_Material( m );
 
 }
 
diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp
index c6b52358264..b1d6e466215 100755
--- a/source/blender/freestyle/intern/stroke/Stroke.cpp
+++ b/source/blender/freestyle/intern/stroke/Stroke.cpp
@@ -404,7 +404,9 @@ Stroke::Stroke(const Stroke& iBrother)
   _mediumType = iBrother._mediumType;
   _textureId = iBrother._textureId;
   _tips = iBrother._tips;
-  _rep = new StrokeRep(*(iBrother._rep));
+  
+	if(iBrother._rep) 
+		_rep = new StrokeRep(*(iBrother._rep));
 }
 
 Stroke::~Stroke()
diff --git a/source/blender/freestyle/intern/system/Iterator.h b/source/blender/freestyle/intern/system/Iterator.h
index 10862d7c8da..d4d9d0aa02c 100644
--- a/source/blender/freestyle/intern/system/Iterator.h
+++ b/source/blender/freestyle/intern/system/Iterator.h
@@ -5,6 +5,7 @@
 #include <string>
 using namespace std;
 
+
 class Iterator
 {
 public:
@@ -16,20 +17,20 @@ public:
   }
 
   virtual void increment() {
-	cerr << "Warning: method increment() not implemented" << endl;
+	cerr << "Warning: increment() not implemented" << endl;
   }
 
   virtual void decrement() {
-	cerr << "Warning: method decrement() not implemented" << endl;
+	cerr << "Warning: decrement() not implemented" << endl;
   }
 
   virtual bool isBegin() const {
-	cerr << "Warning: method isBegin() not implemented" << endl;
+	cerr << "Warning: isBegin() not implemented" << endl;
 	return false;
-  }
+  }	
 
   virtual bool isEnd() const {
-	cerr << "Warning: method isEnd() not implemented" << endl;
+	cerr << "Warning:  isEnd() not implemented" << endl;
 	return false;
   }