archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

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

Browse Source
This commit is contained in:
Maxime Curioni
2008-07-31 11:59:06 +00:00
parent f09f89d5dc
commit 6a6c23ecd8
9 changed files with 424 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/freestyle/intern/python/BPy_Convert.cpp
View File

@@ -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;
}