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

diff --git a/source/blender/freestyle/intern/view_map/Silhouette.cpp b/source/blender/freestyle/intern/view_map/Silhouette.cpp
index db4f82d369e..7a7d0a51d4b 100755
--- a/source/blender/freestyle/intern/view_map/Silhouette.cpp
+++ b/source/blender/freestyle/intern/view_map/Silhouette.cpp
@@ -349,12 +349,12 @@ real FEdge::z_discontinuity() const
 //{
 //  return _VertexA->shape()->material();
 //}
-const Material& FEdgeSharp::aMaterial() const {
-  return _VertexA->shape()->material(_aMaterialIndex);
+const FrsMaterial& FEdgeSharp::aFrsMaterial() const {
+  return _VertexA->shape()->frs_material(_aFrsMaterialIndex);
 }
 
-const Material& FEdgeSharp::bMaterial() const {
-  return _VertexA->shape()->material(_bMaterialIndex);
+const FrsMaterial& FEdgeSharp::bFrsMaterial() const {
+  return _VertexA->shape()->frs_material(_bFrsMaterialIndex);
 }
 
                  /**********************************/
@@ -365,6 +365,6 @@ const Material& FEdgeSharp::bMaterial() const {
                   /*                                */
                   /**********************************/
 
-const Material& FEdgeSmooth::material() const {
-  return _VertexA->shape()->material(_MaterialIndex);
+const FrsMaterial& FEdgeSmooth::frs_material() const {
+  return _VertexA->shape()->frs_material(_FrsMaterialIndex);
 }