Renamed FrsCurve, FrsNoise and FrsMaterial Python extension types

to those names without the "Frs" prefix.  These types are part of
the Freestyle module, so that there is no need to make their names
globally unique.

5 files changed, 11 insertions, 11 deletions

diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
index 27582b7f25e..b33a9096e81 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
@@ -18,7 +18,7 @@ int FrsMaterial_Init( PyObject *module )
 		return -1;
 
 	Py_INCREF( &FrsMaterial_Type );
-	PyModule_AddObject(module, "FrsMaterial", (PyObject *)&FrsMaterial_Type);
+	PyModule_AddObject(module, "Material", (PyObject *)&FrsMaterial_Type);
 	return 0;
 }
 
@@ -36,7 +36,7 @@ static char FrsMaterial___doc__[] =
 "   Copy constructor.\n"
 "\n"
 "   :arg m: A Material object.\n"
-"   :type m: :class:`FrsMaterial`\n"
+"   :type m: :class:`Material`\n"
 "\n"
 ".. method:: __init__(iDiffuse, iAmbiant, iSpecular, iEmission, iShininess)\n"
 "\n"
@@ -112,7 +112,7 @@ static void FrsMaterial___dealloc__( BPy_FrsMaterial* self)
 
 static PyObject * FrsMaterial___repr__( BPy_FrsMaterial* self)
 {
-    return PyUnicode_FromFormat("FrsMaterial - address: %p", self->m );
+    return PyUnicode_FromFormat("Material - address: %p", self->m );
 }
 
 static char FrsMaterial_diffuse___doc__[] =
@@ -553,7 +553,7 @@ static PyMethodDef BPy_FrsMaterial_methods[] = {
 
 PyTypeObject FrsMaterial_Type = {
 	PyVarObject_HEAD_INIT(NULL, 0)
-	"FrsMaterial",                  /* tp_name */
+	"Material",                     /* tp_name */
 	sizeof(BPy_FrsMaterial),        /* tp_basicsize */
 	0,                              /* tp_itemsize */
 	(destructor)FrsMaterial___dealloc__, /* tp_dealloc */
diff --git a/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp b/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
index d9d2540c1e8..bd2b5a4dad0 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
+++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
@@ -19,7 +19,7 @@ int FrsNoise_Init( PyObject *module )
 		return -1;
 
 	Py_INCREF( &FrsNoise_Type );
-	PyModule_AddObject(module, "FrsNoise", (PyObject *)&FrsNoise_Type);
+	PyModule_AddObject(module, "Noise", (PyObject *)&FrsNoise_Type);
 	return 0;
 }
 
@@ -49,7 +49,7 @@ static void FrsNoise___dealloc__(BPy_FrsNoise* self)
 
 static PyObject * FrsNoise___repr__(BPy_FrsNoise* self)
 {
-    return PyUnicode_FromFormat("FrsNoise - address: %p", self->n );
+    return PyUnicode_FromFormat("Noise - address: %p", self->n );
 }
 
 static char FrsNoise_turbulence1___doc__[] =
@@ -228,7 +228,7 @@ static PyMethodDef BPy_FrsNoise_methods[] = {
 
 PyTypeObject FrsNoise_Type = {
 	PyVarObject_HEAD_INIT(NULL, 0)
-	"FrsNoise",                     /* tp_name */
+	"Noise",                        /* tp_name */
 	sizeof(BPy_FrsNoise),           /* tp_basicsize */
 	0,                              /* tp_itemsize */
 	(destructor)FrsNoise___dealloc__, /* tp_dealloc */
diff --git a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
index f35ef62030d..3b5924464fe 100644
--- a/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
@@ -31,7 +31,7 @@ int Interface1D_Init( PyObject *module )
 	if( PyType_Ready( &FrsCurve_Type ) < 0 )
 		return -1;
 	Py_INCREF( &FrsCurve_Type );
-	PyModule_AddObject(module, "FrsCurve", (PyObject *)&FrsCurve_Type);
+	PyModule_AddObject(module, "Curve", (PyObject *)&FrsCurve_Type);
 
 	if( PyType_Ready( &Chain_Type ) < 0 )
 		return -1;
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
index 1ec9e3efc53..b967351f4dc 100644
--- a/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
@@ -27,7 +27,7 @@ static char FrsCurve___doc__[] =
 "   Copy Constructor.\n"
 "\n"
 "   :arg iBrother: A FrsCurve object.\n"
-"   :type iBrother: :class:`FrsCurve`\n"
+"   :type iBrother: :class:`Curve`\n"
 "\n"
 ".. method:: __init__(iId)\n"
 "\n"
@@ -154,7 +154,7 @@ static PyMethodDef BPy_FrsCurve_methods[] = {
 
 PyTypeObject FrsCurve_Type = {
 	PyVarObject_HEAD_INIT(NULL, 0)
-	"FrsCurve",                     /* tp_name */
+	"Curve",                        /* tp_name */
 	sizeof(BPy_FrsCurve),           /* tp_basicsize */
 	0,                              /* tp_itemsize */
 	0,                              /* tp_dealloc */
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
index d7518b107a6..818af164a99 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
@@ -35,7 +35,7 @@ int UnaryFunction0DMaterial_Init( PyObject *module ) {
 
 static char UnaryFunction0DMaterial___doc__[] =
 "Base class for unary functions (functors) that work on\n"
-":class:`Interface0DIterator` and return a :class:`FrsMaterial` object.\n"
+":class:`Interface0DIterator` and return a :class:`Material` object.\n"
 "\n"
 ".. method:: __init__()\n"
 "\n"