diff options
| author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-07-31 15:59:06 +0400 |
|---|---|---|
| committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-07-31 15:59:06 +0400 |
| commit | 6a6c23ecd8af6b1216975ad87b1602f618a7a5fd (patch) | |
| tree | 06c19014d080eb7dec286790eb0d49b278ad3cd5 /source/blender/freestyle/intern/python/BPy_Convert.h | |
| parent | f09f89d5dcbc5532eeda9f54f0e1163373491083 (diff) | |
soc-2008-mxcurioni: moved namespace collision resolution to the freestyle_init.py (for Curve, Material and Noise)
Diffstat (limited to 'source/blender/freestyle/intern/python/BPy_Convert.h')
| -rw-r--r-- | source/blender/freestyle/intern/python/BPy_Convert.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 ); |