Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Curioni <maxime.curioni@gmail.com>2008-08-07 19:04:25 +0400
committerMaxime Curioni <maxime.curioni@gmail.com>2008-08-07 19:04:25 +0400
commit9a1217e55980f9b0a501fbe03ab2ea559638392d (patch)
tree28b4c5bcf547d2d9f63d7d687ff6f43064cc0dc5 /source/blender/freestyle/intern/view_map/Functions0D.h
parent1baf09110b2c3bd4a6eea128b61ca9a0017f81dd (diff)
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.
Diffstat (limited to 'source/blender/freestyle/intern/view_map/Functions0D.h')
-rwxr-xr-xsource/blender/freestyle/intern/view_map/Functions0D.h6
1 files changed, 3 insertions, 3 deletions
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 <set>
# include <vector>
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<Material>
+ class LIB_VIEW_MAP_EXPORT MaterialF0D : public UnaryFunction0D<FrsMaterial>
{
public:
/*! Returns the string "MaterialF0D"*/
@@ -358,7 +358,7 @@ namespace Functions0D {
return "MaterialF0D";
}
/*! the () operator.*/
- Material operator()(Interface0DIterator& iter);
+ FrsMaterial operator()(Interface0DIterator& iter);
};
// ShapeIdF0D