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_Freestyle.cpp | |
| 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_Freestyle.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/python/BPy_Freestyle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 ); |