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:
Diffstat (limited to 'source/blender/freestyle/intern/scene_graph/NodeShape.h')
-rwxr-xr-xsource/blender/freestyle/intern/scene_graph/NodeShape.h8
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