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. --- source/blender/freestyle/intern/view_map/Functions0D.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/freestyle/intern/view_map/Functions0D.h') diff --git a/source/blender/freestyle/intern/view_map/Functions0D.h b/source/blender/freestyle/intern/view_map/Functions0D.h index 9543e8c34a6..24d2edac094 100755 --- a/source/blender/freestyle/intern/view_map/Functions0D.h +++ b/source/blender/freestyle/intern/view_map/Functions0D.h @@ -34,7 +34,7 @@ # include "Interface0D.h" # include "../geometry/Geom.h" # include "../system/Exception.h" -# include "../scene_graph/Material.h" +# include "../scene_graph/FrsMaterial.h" # include # include class FEdge; @@ -350,7 +350,7 @@ namespace Functions0D { * to deal with this cases in a specific way should implement * its own getMaterial functor. */ - class LIB_VIEW_MAP_EXPORT MaterialF0D : public UnaryFunction0D + class LIB_VIEW_MAP_EXPORT MaterialF0D : public UnaryFunction0D { public: /*! Returns the string "MaterialF0D"*/ @@ -358,7 +358,7 @@ namespace Functions0D { return "MaterialF0D"; } /*! the () operator.*/ - Material operator()(Interface0DIterator& iter); + FrsMaterial operator()(Interface0DIterator& iter); }; // ShapeIdF0D -- cgit v1.2.3