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, 3 insertions, 3 deletions

diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
index 052583e4621..6f7d4ba5015 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
@@ -180,17 +180,17 @@ int FrsMaterial___init__(BPy_FrsMaterial *self, PyObject *args, PyObject *kwds)
         return -1;
 
 	if( !obj1 ){
-		self->m = new Material();
+		self->m = new FrsMaterial();
 
 	} else if( BPy_FrsMaterial_Check(obj1) ) {
 		if( ((BPy_FrsMaterial *) obj1)->m )
-			self->m = new Material(*( ((BPy_FrsMaterial *) obj1)->m ));
+			self->m = new FrsMaterial(*( ((BPy_FrsMaterial *) obj1)->m ));
 		else
 			return -1;
 
 	} else if( PyFloat_Check(obj1) ) {
 		f1 = PyFloat_AsDouble(obj1);
-		self->m = new Material(&f1, &f2, &f3, &f4, f5);
+		self->m = new FrsMaterial(&f1, &f2, &f3, &f4, f5);
 
 	} else {
 		return -1;