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/view_map/Functions0D.cpp b/source/blender/freestyle/intern/view_map/Functions0D.cpp
index c868510624c..1bd6d6f46f1 100755
--- a/source/blender/freestyle/intern/view_map/Functions0D.cpp
+++ b/source/blender/freestyle/intern/view_map/Functions0D.cpp
@@ -288,17 +288,17 @@ namespace Functions0D {
     return n;
   }
 
-  Material MaterialF0D::operator()(Interface0DIterator& iter) {
+  FrsMaterial MaterialF0D::operator()(Interface0DIterator& iter) {
     FEdge *fe1, *fe2;
     getFEdges(iter,fe1,fe2);
     
     if(fe1 == 0)
       getFEdges(iter, fe1, fe2);
-    Material mat;
+    FrsMaterial mat;
     if(fe1->isSmooth())
-      mat = ((FEdgeSmooth*)fe1)->material();
+      mat = ((FEdgeSmooth*)fe1)->frs_material();
     else
-      mat = ((FEdgeSharp*)fe1)->bMaterial();
+      mat = ((FEdgeSharp*)fe1)->bFrsMaterial();
     //    const SShape * sshape = getShapeF0D(iter);
     //    return sshape->material();
     return mat;