soc-2008-mxcurioni: moved namespace collision resolution to the freestyle_init.py (for Curve, Material and Noise)

2 files changed, 3 insertions, 3 deletions

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 22a4dbc378e..8911cc7f290 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_FrsMaterial_from_Material(m);
+	return BPy_Material_from_Material(m);
 }
 
 PyObject * FEdgeSharp_bMaterial( BPy_FEdgeSharp *self ) {
 	Material m( self->fes->aMaterial() );
-	return BPy_FrsMaterial_from_Material(m);
+	return BPy_Material_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 6a11b6c1e98..52b501e0746 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_FrsMaterial_from_Material(m);
+	return BPy_Material_from_Material(m);
 }
 
 PyObject * FEdgeSmooth_setNormal( BPy_FEdgeSmooth *self, PyObject *args ) {