[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28690] branches/soc-2008-mxcurioni: Renamed FrsCurve, FrsNoise and FrsMaterial Python extension types
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sun May 9 20:05:33 CEST 2010
Revision: 28690
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28690
Author: kjym3
Date: 2010-05-09 20:05:33 +0200 (Sun, 09 May 2010)
Log Message:
-----------
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.
Modified Paths:
--------------
branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/shaders.py
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
Modified: branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/shaders.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/shaders.py 2010-05-09 17:44:39 UTC (rev 28689)
+++ branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/shaders.py 2010-05-09 18:05:33 UTC (rev 28690)
@@ -911,7 +911,7 @@
class pyPerlinNoise1DShader(StrokeShader):
def __init__(self, freq = 10, amp = 10, oct = 4):
StrokeShader.__init__(self)
- self.__noise = FrsNoise()
+ self.__noise = Noise()
self.__freq = freq
self.__amp = amp
self.__oct = oct
@@ -930,7 +930,7 @@
class pyPerlinNoise2DShader(StrokeShader):
def __init__(self, freq = 10, amp = 10, oct = 4):
StrokeShader.__init__(self)
- self.__noise = FrsNoise()
+ self.__noise = Noise()
self.__freq = freq
self.__amp = amp
self.__oct = oct
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp 2010-05-09 17:44:39 UTC (rev 28689)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp 2010-05-09 18:05:33 UTC (rev 28690)
@@ -18,7 +18,7 @@
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 @@
" 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 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 @@
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 */
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp 2010-05-09 17:44:39 UTC (rev 28689)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp 2010-05-09 18:05:33 UTC (rev 28690)
@@ -19,7 +19,7 @@
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 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 @@
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 */
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface1D.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface1D.cpp 2010-05-09 17:44:39 UTC (rev 28689)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface1D.cpp 2010-05-09 18:05:33 UTC (rev 28690)
@@ -31,7 +31,7 @@
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;
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp 2010-05-09 17:44:39 UTC (rev 28689)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp 2010-05-09 18:05:33 UTC (rev 28690)
@@ -27,7 +27,7 @@
" 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 @@
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 */
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp 2010-05-09 17:44:39 UTC (rev 28689)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp 2010-05-09 18:05:33 UTC (rev 28690)
@@ -35,7 +35,7 @@
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"
More information about the Bf-blender-cvs
mailing list