diff options
author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-08-07 19:04:25 +0400 |
---|---|---|
committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-08-07 19:04:25 +0400 |
commit | 9a1217e55980f9b0a501fbe03ab2ea559638392d (patch) | |
tree | 28b4c5bcf547d2d9f63d7d687ff6f43064cc0dc5 /source/blender/freestyle/intern/scene_graph/NodeShape.h | |
parent | 1baf09110b2c3bd4a6eea128b61ca9a0017f81dd (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/scene_graph/NodeShape.h')
-rwxr-xr-x | source/blender/freestyle/intern/scene_graph/NodeShape.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/freestyle/intern/scene_graph/NodeShape.h b/source/blender/freestyle/intern/scene_graph/NodeShape.h index 34b049bfeb5..9849d4661b8 100755 --- a/source/blender/freestyle/intern/scene_graph/NodeShape.h +++ b/source/blender/freestyle/intern/scene_graph/NodeShape.h @@ -37,7 +37,7 @@ # include "Rep.h" # include "../geometry/BBox.h" # include "../geometry/Geom.h" -# include "Material.h" +# include "FrsMaterial.h" using namespace std; using namespace Geometry; @@ -71,11 +71,11 @@ public: virtual void accept(SceneVisitor& v); /*! Sets the shape material */ - inline void setMaterial(const Material& iMaterial) { _Material = iMaterial; } + inline void setFrsMaterial(const FrsMaterial& iMaterial) { _FrsMaterial = iMaterial; } /*! accessors */ /*! returns the shape's material */ - inline Material& material() { return _Material; } + inline FrsMaterial& frs_material() { return _FrsMaterial; } inline const vector<Rep*>& shapes() {return _Shapes;} private: @@ -83,7 +83,7 @@ private: vector<Rep*> _Shapes; /*! Shape Material */ - Material _Material; + FrsMaterial _FrsMaterial; }; #endif // NODESHAPE_H |