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

1 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index 0b136b7702f..13e4f332c32 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -1,7 +1,7 @@
 #include "BPy_Convert.h"
 
 #include "BPy_BBox.h"
-#include "BPy_FrsMaterial.h"
+#include "BPy_Material.h"
 #include "BPy_Id.h"
 #include "BPy_IntegrationType.h"
 #include "BPy_Interface0D.h"
@@ -188,9 +188,9 @@ PyObject * BPy_ViewShape_from_ViewShape( ViewShape& vs ) {
 	return py_vs;
 }
 
-PyObject * BPy_FrsMaterial_from_Material( Material& m ){
-	PyObject *py_m = FrsMaterial_Type.tp_new( &FrsMaterial_Type, 0, 0 );
-	((BPy_FrsMaterial*) py_m)->m = new Material( m );
+PyObject * BPy_Material_from_Material( Material& m ){
+	PyObject *py_m = Material_Type.tp_new( &Material_Type, 0, 0 );
+	((BPy_Material*) py_m)->m = new Material( m );
 
 	return py_m;
 }