diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-07-18 16:40:11 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-08-12 05:10:31 +0400 |
commit | 1ddb8e238e1239998c810fca5733641005b0964f (patch) | |
tree | 7b9b583ad2c916ad036fd13feaff2b55bec82d92 /source/blender/freestyle/intern/stroke/Stroke.h | |
parent | 7f3488f9925d974ac5e95385fccd61ede1531d1f (diff) |
Freestyle: Keep a reference of the line style in Stroke rather than in StrokeRep.
Diffstat (limited to 'source/blender/freestyle/intern/stroke/Stroke.h')
-rw-r--r-- | source/blender/freestyle/intern/stroke/Stroke.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h index e18e176baba..d68a5938e98 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.h +++ b/source/blender/freestyle/intern/stroke/Stroke.h @@ -546,6 +546,7 @@ private: bool _tips; Vec2r _extremityOrientations[2]; // the orientations of the first and last extermity StrokeRep *_rep; + FreestyleLineStyle *_lineStyle; public: /*! default constructor */ @@ -625,7 +626,6 @@ public: /* Render method */ void ScaleThickness(float iFactor); - void SetLineStyle(struct FreestyleLineStyle *iLineStyle); void Render(const StrokeRenderer *iRenderer); void RenderBasic(const StrokeRenderer *iRenderer); @@ -645,6 +645,12 @@ public: return _mediumType; } + /*! Return the line style associated to this Stroke. */ + inline FreestyleLineStyle *getLineStyle() + { + return _lineStyle; + } + /*! Returns the id of the texture used to simulate th marks system for this Stroke */ inline unsigned int getTextureId() {return _textureId;} @@ -740,6 +746,12 @@ public: /*! sets the 2D length of the Stroke. */ void setLength(float iLength); + /*! sets the line style of the Stroke. */ + void setLineStyle(struct FreestyleLineStyle *iLineStyle) + { + _lineStyle = iLineStyle; + } + /*! sets the medium type that must be used for this Stroke. */ inline void setMediumType(MediumType iType) { |