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.

1 files changed, 4 insertions, 4 deletions

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..0970e22a726 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
@@ -152,13 +152,13 @@ PyObject * FEdgeSmooth_normal( BPy_FEdgeSmooth *self ) {
 }
 
 PyObject * FEdgeSmooth_materialIndex( BPy_FEdgeSmooth *self ) {
-	return PyInt_FromLong( self->fes->materialIndex() );
+	return PyInt_FromLong( self->fes->frs_materialIndex() );
 }
 
 
 PyObject * FEdgeSmooth_material( BPy_FEdgeSmooth *self ) {
-	Material m( self->fes->material() );
-	return BPy_FrsMaterial_from_Material(m);
+	FrsMaterial m( self->fes->frs_material() );
+	return BPy_FrsMaterial_from_FrsMaterial(m);
 }
 
 PyObject * FEdgeSmooth_setNormal( BPy_FEdgeSmooth *self, PyObject *args ) {
@@ -186,7 +186,7 @@ PyObject * FEdgeSmooth_setMaterialIndex( BPy_FEdgeSmooth *self, PyObject *args )
 		Py_RETURN_NONE;
 	}
 	
-	self->fes->setMaterialIndex( i );
+	self->fes->setFrsMaterialIndex( i );
 
 	Py_RETURN_NONE;
 }