From 9a1217e55980f9b0a501fbe03ab2ea559638392d Mon Sep 17 00:00:00 2001 From: Maxime Curioni Date: Thu, 7 Aug 2008 15:04:25 +0000 Subject: soc-2008-mxcurioni: first version of lib3ds code. It does NOT work yet and has to be debugged. It can be activate in app_blender/api.cpp by replacing the FRS_scene_3ds_export call in FRS_prepare, by FRS_load_mesh. All of the reference to the original Material class were renamed to FrsMaterial to resolve a name collision with Blender. To keep the window context necessary to draw the strokes after RE_Database_FromScene has been called, the display_clear function is used. --- .../intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp') 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..336331d92d5 100644 --- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp @@ -166,21 +166,21 @@ PyObject * FEdgeSharp_normalB( BPy_FEdgeSharp *self ) { } PyObject * FEdgeSharp_aMaterialIndex( BPy_FEdgeSharp *self ) { - return PyInt_FromLong( self->fes->aMaterialIndex() ); + return PyInt_FromLong( self->fes->aFrsMaterialIndex() ); } PyObject * FEdgeSharp_bMaterialIndex( BPy_FEdgeSharp *self ) { - return PyInt_FromLong( self->fes->bMaterialIndex() ); + return PyInt_FromLong( self->fes->bFrsMaterialIndex() ); } PyObject * FEdgeSharp_aMaterial( BPy_FEdgeSharp *self ) { - Material m( self->fes->aMaterial() ); - return BPy_FrsMaterial_from_Material(m); + FrsMaterial m( self->fes->aFrsMaterial() ); + return BPy_FrsMaterial_from_FrsMaterial(m); } PyObject * FEdgeSharp_bMaterial( BPy_FEdgeSharp *self ) { - Material m( self->fes->aMaterial() ); - return BPy_FrsMaterial_from_Material(m); + FrsMaterial m( self->fes->aFrsMaterial() ); + return BPy_FrsMaterial_from_FrsMaterial(m); } PyObject * FEdgeSharp_setNormalA( BPy_FEdgeSharp *self, PyObject *args ) { @@ -225,7 +225,7 @@ PyObject * FEdgeSharp_setaMaterialIndex( BPy_FEdgeSharp *self, PyObject *args ) Py_RETURN_NONE; } - self->fes->setaMaterialIndex( i ); + self->fes->setaFrsMaterialIndex( i ); Py_RETURN_NONE; } @@ -238,7 +238,7 @@ PyObject * FEdgeSharp_setbMaterialIndex( BPy_FEdgeSharp *self, PyObject *args ) Py_RETURN_NONE; } - self->fes->setbMaterialIndex( i ); + self->fes->setbFrsMaterialIndex( i ); Py_RETURN_NONE; } -- cgit v1.2.3