Added StrokeAttribute class. Beginning of StrokeVertex.

IMPORTANT: The setters functions' names were normalized due to constant confusion regarding capitalization. All the function names start with set... instead of Set.... This convention was changed all throughout Freestyle. To use Freestyle as an external renderer, the SWIG library MUST be regenerated.

15 files changed, 91 insertions, 91 deletions

diff --git a/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h
index d92575cf110..9eee6714b09 100755
--- a/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h
+++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h
@@ -59,7 +59,7 @@ namespace Functions0D {
      *    value. (the larger, the smoother)
      */
     DensityF0D(double sigma = 2) : UnaryFunction0D<double>() {
-      _filter.SetSigma((float)sigma);
+      _filter.setSigma((float)sigma);
     }
     /*! Returns the string "DensityF0D"*/
     string getName() const {
@@ -87,7 +87,7 @@ namespace Functions0D {
      *   will be used.
      */
     LocalAverageDepthF0D(real maskSize=5.f) : UnaryFunction0D<double>() {
-      _filter.SetSigma((float)maskSize/2.f);
+      _filter.setSigma((float)maskSize/2.f);
     }
     /*! Returns the string "LocalAverageDepthF0D"*/
     string getName() const {
diff --git a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
index b1c5317c5f1..653e0158538 100755
--- a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
+++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
@@ -153,7 +153,7 @@ SpatialNoiseShader::shade(Stroke &ioStroke) const
       Vec2r noise(-ori2d[1]*_amount*bruit,
 		  ori2d[0]*_amount*bruit);
 
-      sv->SetPoint(p[0]+noise[0], p[1]+noise[1]);
+      sv->setPoint(p[0]+noise[0], p[1]+noise[1]);
       p0=p;
 
       ++v;
@@ -351,7 +351,7 @@ Smoother::copyVertices ()
       const Vec2r p1(_vertex[i]);
       Vec2r p(p0 + _carricatureFactor * (p1 - p0));
 
-      (v)->SetPoint(p[0], p[1]);
+      (v)->setPoint(p[0], p[1]);
       i++;
     }
 
diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
index 0022a36aee2..05cc13fd96c 100755
--- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
+++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
@@ -520,9 +520,9 @@ namespace StrokeShaders {
       break;
     }
     unsigned int texId = instance->getBrushTextureIndex(pathname, mediumType);
-    stroke.SetMediumType(mediumType);
-    stroke.SetTips(hasTips);
-    stroke.SetTextureId(texId);
+    stroke.setMediumType(mediumType);
+    stroke.setTips(hasTips);
+    stroke.setTextureId(texId);
   }
 
   // FIXME
@@ -533,9 +533,9 @@ namespace StrokeShaders {
       return;
     string pathname = TextureManager::Options::getBrushesPath() + "/" + _texturePath;
     unsigned int texId = instance->getBrushTextureIndex(pathname, _mediumType);
-    stroke.SetMediumType(_mediumType);
-    stroke.SetTips(_tips);
-    stroke.SetTextureId(texId);
+    stroke.setMediumType(_mediumType);
+    stroke.setTips(_tips);
+    stroke.setTextureId(texId);
   }
 
   //
@@ -564,9 +564,9 @@ namespace StrokeShaders {
     dn.normalize();
 
     Vec2d newFirst(first+_amount*d1);
-    (v0)->SetPoint(newFirst[0], newFirst[1]);
+    (v0)->setPoint(newFirst[0], newFirst[1]);
     Vec2d newLast(last+_amount*dn);
-    (vn)->SetPoint(newLast[0], newLast[1]);
+    (vn)->setPoint(newLast[0], newLast[1]);
   }
 
   void SamplingShader::shade(Stroke& stroke) const
@@ -585,7 +585,7 @@ namespace StrokeShaders {
 	Vec2f n(fun(it));
 	sv = dynamic_cast<StrokeVertex*>(&(*it));
 	Vec2d newPoint(sv->x()+_amount*n.x(), sv->y()+_amount*n.y());
-	sv->SetPoint(newPoint[0], newPoint[1]);
+	sv->setPoint(newPoint[0], newPoint[1]);
 	++it;
       }
   }
@@ -686,8 +686,8 @@ namespace StrokeShaders {
 	((it!=itend) && (p!=pend));
 	++it)
       {
-	it->SetX(p->x());
-	it->SetY(p->y());
+	it->setX(p->x());
+	it->setY(p->y());
 	last = p;
 	++p;
 	++n;
@@ -695,8 +695,8 @@ namespace StrokeShaders {
     // nExtraVertex should stay unassigned
     for(int i=0; i< nExtraVertex; ++i)
       {
-	it->SetX(last->x());
-	it->SetY(last->y());
+	it->setX(last->x());
+	it->setY(last->y());
 	if(it.isEnd())
 	  cerr << "Warning: Problem encountered while creating B-spline" << endl;
 	++it;
@@ -810,8 +810,8 @@ namespace StrokeShaders {
 	((it!=itend) && (p!=pend));
 	++it)
       {
-	it->SetX(p->x());
-	it->SetY(p->y());
+	it->setX(p->x());
+	it->setY(p->y());
 	//      double x = p->x();
 	//      double y = p->y();
 	//      cout << "x = " << x << "-" << "y = " << y << endl;
@@ -859,7 +859,7 @@ namespace StrokeShaders {
     (it!=itend) && (a!=aend);
     ++it)
     {
-      (it)->SetAttribute(*a);
+      (it)->setAttribute(*a);
       if((index <= index1)||(index>index2))
         ++a;
       ++index;
@@ -894,7 +894,7 @@ namespace StrokeShaders {
 	float t = 4.f*(0.25f - (u-0.5)*(u-0.5));
 	float curvature_coeff = (M_PI-curv_fun(it))/M_PI;
 	Vec2d newPoint(sv->x()+curvature_coeff*t*_amount*n.x(), sv->y()+curvature_coeff*t*_amount*n.y());
-	sv->SetPoint(newPoint[0], newPoint[1]);
+	sv->setPoint(newPoint[0], newPoint[1]);
 	++it;
       }
   }
@@ -998,10 +998,10 @@ namespace StrokeShaders {
 	    v!=b;
 	    ++v)
 	  {
-	    v->SetPoint((*cp)->A.x()+v->u()*u.x()+n.x()*offset, (*cp)->A.y()+v->u()*u.y()+n.y()*offset);
+	    v->setPoint((*cp)->A.x()+v->u()*u.x()+n.x()*offset, (*cp)->A.y()+v->u()*u.y()+n.y()*offset);
 	  }
 	//    u.normalize();
-	//    (*a)->SetPoint((*a)->x()-u.x()*10, (*a)->y()-u.y()*10);
+	//    (*a)->setPoint((*a)->x()-u.x()*10, (*a)->y()-u.y()*10);
       }
 
     // delete stuff
@@ -1036,7 +1036,7 @@ namespace StrokeShaders {
 	v!=vend;
 	++v)
       {
-	v->SetPoint(piece.A.x()+v->u()*u.x()+n.x()*offset, piece.A.y()+v->u()*u.y()+n.y()*offset);
+	v->setPoint(piece.A.x()+v->u()*u.x()+n.x()*offset, piece.A.y()+v->u()*u.y()+n.y()*offset);
       }
   }
 
@@ -1101,7 +1101,7 @@ namespace StrokeShaders {
     //cout << "-----------------------------------------------" << endl;
     for(;(v!=vend)&&(a!=aend);++v,++a)
       {
-	v->SetAttribute(*a);
+	v->setAttribute(*a);
 	//cout << "thickness = " << (*a).getThickness()[0] << "-" << (*a).getThickness()[1] << endl;
       }
     // we're done!
diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp
index b185bba92a0..bdca8f968fe 100755
--- a/source/blender/freestyle/intern/stroke/Canvas.cpp
+++ b/source/blender/freestyle/intern/stroke/Canvas.cpp
@@ -258,7 +258,7 @@ void Canvas::ReplaceStyleModule(unsigned index, StyleModule *iStyleModule)
     }
 }
 
-void Canvas::SetVisible(unsigned index, bool iVisible) {
+void Canvas::setVisible(unsigned index, bool iVisible) {
   _StyleModules[index]->setDisplayed(iVisible);
 }
  
diff --git a/source/blender/freestyle/intern/stroke/Canvas.h b/source/blender/freestyle/intern/stroke/Canvas.h
index cae50162933..549c6a97d55 100755
--- a/source/blender/freestyle/intern/stroke/Canvas.h
+++ b/source/blender/freestyle/intern/stroke/Canvas.h
@@ -177,16 +177,16 @@ public:
   virtual bool getRecordFlag() const {return false;}
 
   /*! modifiers */
-  inline void SetSelectedFEdge(FEdge *iFEdge) {_SelectedFEdge = iFEdge;}
+  inline void setSelectedFEdge(FEdge *iFEdge) {_SelectedFEdge = iFEdge;}
   /*! inserts a shader at pos index+1 */
   void InsertStyleModule(unsigned index, StyleModule *iStyleModule);
   void RemoveStyleModule(unsigned index);
   void SwapStyleModules(unsigned i1, unsigned i2);
   void ReplaceStyleModule(unsigned index, StyleModule *iStyleModule);
-  void SetVisible(unsigned index, bool iVisible) ;
-  //inline void SetDensityMap(InformationMap<RGBImage>* iMap) {_DensityMap = iMap;}
+  void setVisible(unsigned index, bool iVisible) ;
+  //inline void setDensityMap(InformationMap<RGBImage>* iMap) {_DensityMap = iMap;}
   inline void AddLayer(StrokeLayer *iLayer) {_Layers.push_back(iLayer);}
-  inline void SetCurrentPaperTextureIndex(int i) {_paperTextureIndex = i;}
+  inline void setCurrentPaperTextureIndex(int i) {_paperTextureIndex = i;}
   void changePaperTexture(bool increment=true) ;
   /*! enables/disables paper texture */
   inline void togglePaperTexture() {_drawPaper = !_drawPaper;}
diff --git a/source/blender/freestyle/intern/stroke/Curve.h b/source/blender/freestyle/intern/stroke/Curve.h
index 400f27e5d5a..7fbe7e701e9 100755
--- a/source/blender/freestyle/intern/stroke/Curve.h
+++ b/source/blender/freestyle/intern/stroke/Curve.h
@@ -218,14 +218,14 @@ public:
   /*! Sets the first SVertex upon which to build
    *  the CurvePoint.
    */
-  inline void SetA(SVertex *iA) {__A = iA;}
+  inline void setA(SVertex *iA) {__A = iA;}
   /*! Sets the second SVertex upon which to build
    *  the CurvePoint.
    */
-  inline void SetB(SVertex *iB) {__B = iB;}
+  inline void setB(SVertex *iB) {__B = iB;}
   /*! Sets the 2D interpolation parameter to use.
    */
-  inline void SetT2d(float t) {_t2d = t;}
+  inline void setT2d(float t) {_t2d = t;}
   //inline void SetT3d(float t) {_t3d = t;}
 
   /* Information access interface */
diff --git a/source/blender/freestyle/intern/stroke/Modifiers.h b/source/blender/freestyle/intern/stroke/Modifiers.h
index c3be65ffc89..21bebebc6f8 100755
--- a/source/blender/freestyle/intern/stroke/Modifiers.h
+++ b/source/blender/freestyle/intern/stroke/Modifiers.h
@@ -64,7 +64,7 @@ struct TimestampModifier : public EdgeModifier<Edge>
   virtual void operator()(Edge& iEdge) 
   {
     TimeStamp *timestamp = TimeStamp::instance();
-    iEdge.SetTimeStamp(timestamp->getTimeStamp());
+    iEdge.setTimeStamp(timestamp->getTimeStamp());
   }
 };
 
diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp
index 8e34d9c5197..cfdd72ac839 100755
--- a/source/blender/freestyle/intern/stroke/Operators.cpp
+++ b/source/blender/freestyle/intern/stroke/Operators.cpp
@@ -756,7 +756,7 @@ void Operators::sort(BinaryPredicate1D& pred) {
 
 Stroke* createStroke(Interface1D& inter) {
   Stroke* stroke = new Stroke;
-  stroke->SetId(inter.getId());
+  stroke->setId(inter.getId());
 
   float currentCurvilignAbscissa = 0.f;
 
@@ -784,7 +784,7 @@ Stroke* createStroke(Interface1D& inter) {
     current = stroke_vertex->point2d();
     Vec3r vec_tmp(current - previous);
     currentCurvilignAbscissa += vec_tmp.norm();
-    stroke_vertex->SetCurvilinearAbscissa(currentCurvilignAbscissa);
+    stroke_vertex->setCurvilinearAbscissa(currentCurvilignAbscissa);
     stroke->push_back(stroke_vertex);
     previous = current;
     ++it;
@@ -805,10 +805,10 @@ Stroke* createStroke(Interface1D& inter) {
     current = stroke_vertex->point2d();
     Vec3r vec_tmp(current - previous);
     currentCurvilignAbscissa += vec_tmp.norm();
-    stroke_vertex->SetCurvilinearAbscissa(currentCurvilignAbscissa);
+    stroke_vertex->setCurvilinearAbscissa(currentCurvilignAbscissa);
     stroke->push_back(stroke_vertex);
   }
-  stroke->SetLength(currentCurvilignAbscissa);
+  stroke->setLength(currentCurvilignAbscissa);
   return stroke;
 }
 
diff --git a/source/blender/freestyle/intern/stroke/QInformationMap.h b/source/blender/freestyle/intern/stroke/QInformationMap.h
index 2542bdba147..ef068f15061 100755
--- a/source/blender/freestyle/intern/stroke/QInformationMap.h
+++ b/source/blender/freestyle/intern/stroke/QInformationMap.h
@@ -49,7 +49,7 @@ public:
   virtual void retrieveMeanAndVariance(int x, int y, float &oMean, float &oVariance) ;
 
   inline const QImage& map() const {return _map;}
-  inline void SetMap(const QImage& iMap, float iw, float ih) {_map = iMap.copy();_w=iw;_h=ih;}
+  inline void setMap(const QImage& iMap, float iw, float ih) {_map = iMap.copy();_w=iw;_h=ih;}
 
 protected:
   virtual float computeGaussian(int x, int y);
diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp
index 7e7eb5ff3f0..c6b52358264 100755
--- a/source/blender/freestyle/intern/stroke/Stroke.cpp
+++ b/source/blender/freestyle/intern/stroke/Stroke.cpp
@@ -450,14 +450,14 @@ Stroke& Stroke::operator=(const Stroke& iBrother)
 }
 
 
-void Stroke::SetLength(float iLength)
+void Stroke::setLength(float iLength)
 {
   _Length = iLength;
   for(vertex_container::iterator v=_Vertices.begin(), vend=_Vertices.end();
   v!=vend;
   ++v)
   {
-    (*v)->SetStrokeLength(iLength);
+    (*v)->setStrokeLength(iLength);
   }
 }
 
@@ -635,7 +635,7 @@ void Stroke::Resample(float iSampling)
     while(t<limit)
     {
       newVertex = new StrokeVertex(&(*it),&(*next),t);
-      //newVertex->SetCurvilinearAbscissa(curvilinearLength);
+      //newVertex->setCurvilinearAbscissa(curvilinearLength);
       newVertices.push_back(newVertex);
       t = t + _sampling/norm_var;
     }
@@ -681,7 +681,7 @@ void Stroke::RemoveVertex(StrokeVertex *iVertex)
   {
     if(it != previous)
       curvabsc += ((*it)->point2d()-(*previous)->point2d()).norm();
-    (*it)->SetCurvilinearAbscissa(curvabsc);
+    (*it)->setCurvilinearAbscissa(curvabsc);
     previous = it;
   }
   _Length = curvabsc;
@@ -690,7 +690,7 @@ void Stroke::RemoveVertex(StrokeVertex *iVertex)
   (it!=itend);
   ++it)
   {
-    (*it)->SetStrokeLength(_Length);
+    (*it)->setStrokeLength(_Length);
   }
 }
 
@@ -710,7 +710,7 @@ void Stroke::InsertVertex(StrokeVertex *iVertex, StrokeInternal::StrokeVertexIte
   ++it)
   {
     curvabsc += ((*it)->point2d()-(*previous)->point2d()).norm();
-    (*it)->SetCurvilinearAbscissa(curvabsc);
+    (*it)->setCurvilinearAbscissa(curvabsc);
     previous = it;
   }
   _Length = curvabsc;
@@ -718,7 +718,7 @@ void Stroke::InsertVertex(StrokeVertex *iVertex, StrokeInternal::StrokeVertexIte
   (it!=itend);
   ++it)
   {
-    (*it)->SetStrokeLength(_Length);
+    (*it)->setStrokeLength(_Length);
   }
 }
 
diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h
index a5cf51f8224..8e4e5e24a2c 100755
--- a/source/blender/freestyle/intern/stroke/Stroke.h
+++ b/source/blender/freestyle/intern/stroke/Stroke.h
@@ -152,7 +152,7 @@ public:
   bool isAttributeAvailableVec3f(const char *iName) const ;
   
   /* modifiers */
-  /*! Sets the attribute's color.
+  /*! sets the attribute's color.
    *    \param r
    *      The new R value.
    *    \param g
@@ -161,31 +161,31 @@ public:
    *      The new B value.
    */
   inline void setColor(float r, float g, float b) { _color[0]=r; _color[1]=g; _color[2]=b; }
-  /*! Sets the attribute's color.
+  /*! sets the attribute's color.
    *    \param iRGB
    *      The new RGB values.
    */
   inline void setColor(const Vec3f& iRGB) { _color[0]=iRGB[0]; _color[1]=iRGB[1]; _color[2]=iRGB[2]; }
-  /*! Sets the attribute's alpha value.
+  /*! sets the attribute's alpha value.
    *  \param alpha
    *    The new alpha value.
    */
   inline void setAlpha(float alpha) { _alpha = alpha; }
-  /*! Sets the attribute's thickness.
+  /*! sets the attribute's thickness.
    *  \param tr
    *    The thickness on the right of the vertex when following the stroke.
    *  \param tl
    *    The thickness on the left of the vertex when following the stroke.
    */
   inline void setThickness(float tr, float tl) { _thickness[0]=tr; _thickness[1]=tl; }
-  /*! Sets the attribute's thickness.
+  /*! sets the attribute's thickness.
    *  \param tRL
    *    The thickness on the right and on the left of the vertex when following the stroke.
    */
   inline void setThickness(const Vec2f& tRL) { _thickness[0]=tRL[0]; _thickness[1]=tRL[1]; }
 
-  /*! Sets the visible flag. True means visible. */
-  inline void SetVisible(bool iVisible){ _visible = iVisible; }
+  /*! sets the visible flag. True means visible. */
+  inline void setVisible(bool iVisible){ _visible = iVisible; }
 
   /*! Adds a user defined attribute of type real
    *  If there is no attribute of name iName, it is added.
@@ -295,24 +295,24 @@ public:
   inline float u() const {return _CurvilignAbscissa/_StrokeLength;}
 
   /* modifiers */
-  /*! Sets the 2D x value */
-  inline void SetX(real x) { _Point2d[0]=x; }
-  /*! Sets the 2D y value */
-  inline void SetY(real y) { _Point2d[1]=y; }
-  /*! Sets the 2D x and y values */
-  inline void SetPoint(real x, real y) { _Point2d[0]=x; _Point2d[1]=y;}
-  /*! Sets the 2D x and y values */
-  inline void SetPoint(const Vec2f& p) { _Point2d[0] = p[0];_Point2d[1] = p[1];}
+  /*! sets the 2D x value */
+  inline void setX(real x) { _Point2d[0]=x; }
+  /*! sets the 2D y value */
+  inline void setY(real y) { _Point2d[1]=y; }
+  /*! sets the 2D x and y values */
+  inline void setPoint(real x, real y) { _Point2d[0]=x; _Point2d[1]=y;}
+  /*! sets the 2D x and y values */
+  inline void setPoint(const Vec2f& p) { _Point2d[0] = p[0];_Point2d[1] = p[1];}
   /*! Returns a reference to the ith 2D point coordinate (i=0 or 1) */
   inline real& operator[](const int i) { return _Point2d[i]; }
-  /*! Sets the attribute. */
-  inline void SetAttribute(const StrokeAttribute& iAttribute) { _Attribute = iAttribute; }
-  /*! Sets the curvilinear abscissa of this StrokeVertex in the Stroke */
-  inline void SetCurvilinearAbscissa(float iAbscissa) {_CurvilignAbscissa = iAbscissa;}
-  /*! Sets the Stroke's length (it's only a value stored by the Stroke Vertex, it won't
+  /*! sets the attribute. */
+  inline void setAttribute(const StrokeAttribute& iAttribute) { _Attribute = iAttribute; }
+  /*! sets the curvilinear abscissa of this StrokeVertex in the Stroke */
+  inline void setCurvilinearAbscissa(float iAbscissa) {_CurvilignAbscissa = iAbscissa;}
+  /*! sets the Stroke's length (it's only a value stored by the Stroke Vertex, it won't
    *  change the real Stroke's length.)
    */
-  inline void SetStrokeLength(float iLength) {_StrokeLength = iLength;}
+  inline void setStrokeLength(float iLength) {_StrokeLength = iLength;}
   
   /* interface definition */
   /* inherited */  
@@ -502,26 +502,26 @@ public:
 
 
   /* modifiers */
-  /*! Sets the Id of the Stroke. */
-  inline void SetId(const Id& id) {_id = id;}
-  /*! Sets the 2D length of the Stroke. */
-  void SetLength(float iLength);
-  /*! Sets the medium type that must be used for this Stroke. */
-  inline void SetMediumType(MediumType iType) {_mediumType = iType;}
-  /*! Sets the texture id to be used to simulate the marks system for this Stroke. */
-  inline void SetTextureId(unsigned int id) {_textureId = id;}
-  /*! Sets the flag telling whether this stroke is using a texture with
+  /*! sets the Id of the Stroke. */
+  inline void setId(const Id& id) {_id = id;}
+  /*! sets the 2D length of the Stroke. */
+  void setLength(float iLength);
+  /*! sets the medium type that must be used for this Stroke. */
+  inline void setMediumType(MediumType iType) {_mediumType = iType;}
+  /*! sets the texture id to be used to simulate the marks system for this Stroke. */
+  inline void setTextureId(unsigned int id) {_textureId = id;}
+  /*! sets the flag telling whether this stroke is using a texture with
    *  tips or not.
    */
-  inline void SetTips(bool iTips) {_tips = iTips;}
+  inline void setTips(bool iTips) {_tips = iTips;}
   
   inline void push_back(StrokeVertex* iVertex) { _Vertices.push_back(iVertex); }
   inline void push_front(StrokeVertex* iVertex) { _Vertices.push_front(iVertex); }
   inline void AddViewEdge(ViewEdge *iViewEdge) {_ViewEdges.push_back(iViewEdge);}
-  inline void SetBeginningOrientation(const Vec2r& iOrientation) {_extremityOrientations[0] = iOrientation;}
-  inline void SetBeginningOrientation(real x, real y) {_extremityOrientations[0] = Vec2r(x,y);}
-  inline void SetEndingOrientation(const Vec2r& iOrientation) {_extremityOrientations[1] = iOrientation;}
-  inline void SetEndingOrientation(real x, real y) {_extremityOrientations[1] = Vec2r(x,y);}
+  inline void setBeginningOrientation(const Vec2r& iOrientation) {_extremityOrientations[0] = iOrientation;}
+  inline void setBeginningOrientation(real x, real y) {_extremityOrientations[0] = Vec2r(x,y);}
+  inline void setEndingOrientation(const Vec2r& iOrientation) {_extremityOrientations[1] = iOrientation;}
+  inline void setEndingOrientation(real x, real y) {_extremityOrientations[1] = Vec2r(x,y);}
 
   /* Information access interface */
   
diff --git a/source/blender/freestyle/intern/stroke/StrokeLayer.h b/source/blender/freestyle/intern/stroke/StrokeLayer.h
index b89b77a85a7..dbe9ea5a75c 100755
--- a/source/blender/freestyle/intern/stroke/StrokeLayer.h
+++ b/source/blender/freestyle/intern/stroke/StrokeLayer.h
@@ -67,7 +67,7 @@ public:
   inline bool empty() const {return _strokes.empty();}
 
   /*! modifiers */
-  inline void SetStrokes(stroke_container& iStrokes) {_strokes = iStrokes;}
+  inline void setStrokes(stroke_container& iStrokes) {_strokes = iStrokes;}
   inline void AddStroke(Stroke *iStroke) {_strokes.push_back(iStroke);}
   
 };
diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.h b/source/blender/freestyle/intern/stroke/StrokeRep.h
index 129769e5489..d8a8dc2d609 100755
--- a/source/blender/freestyle/intern/stroke/StrokeRep.h
+++ b/source/blender/freestyle/intern/stroke/StrokeRep.h
@@ -130,7 +130,7 @@ public:
  
   /*! modifiers */
   inline void setMediumType(Stroke::MediumType itype) {_strokeType=itype;}
-  inline void SetTextureId(unsigned textureId) {_textureId = textureId;}
+  inline void setTextureId(unsigned textureId) {_textureId = textureId;}
 
   
 };
diff --git a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
index 6d0f5aa847c..279655c22b7 100755
--- a/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
@@ -36,7 +36,7 @@ LineRep* StrokeTesselator::Tesselate(Stroke *iStroke)
   Stroke::vertex_iterator v,vend;
   if(2 == iStroke->vertices_size())
   {
-    line->SetStyle(LineRep::LINES);
+    line->setStyle(LineRep::LINES);
     v = iStroke->vertices_begin();
     StrokeVertex *svA= (*v);
     v++;
@@ -49,9 +49,9 @@ LineRep* StrokeTesselator::Tesselate(Stroke *iStroke)
   else
   {
     if(_overloadMaterial)
-      line->SetMaterial(_Material);
+      line->setMaterial(_Material);
 
-    line->SetStyle(LineRep::LINE_STRIP);
+    line->setStyle(LineRep::LINE_STRIP);
 
     for(v=iStroke->vertices_begin(), vend=iStroke->vertices_end();
     v!=vend;
@@ -62,7 +62,7 @@ LineRep* StrokeTesselator::Tesselate(Stroke *iStroke)
       line->AddVertex(V);         
     } 
   }
-  line->SetId(iStroke->getId());
+  line->setId(iStroke->getId());
   line->ComputeBBox();
 
   return line;
@@ -74,8 +74,8 @@ NodeGroup* StrokeTesselator::Tesselate(StrokeVertexIterator begin, StrokeVertexI
   NodeGroup *group = new NodeGroup;
   NodeShape *tshape = new NodeShape;
   group->AddChild(tshape);
-  //tshape->material().SetDiffuse(0.f, 0.f, 0.f, 1.f);
-  tshape->SetMaterial(_Material);
+  //tshape->material().setDiffuse(0.f, 0.f, 0.f, 1.f);
+  tshape->setMaterial(_Material);
 
   for(StrokeVertexIterator c=begin, cend=end;
   c!=cend;
diff --git a/source/blender/freestyle/intern/stroke/StrokeTesselator.h b/source/blender/freestyle/intern/stroke/StrokeTesselator.h
index 767d82d3d98..eaeb73504c9 100755
--- a/source/blender/freestyle/intern/stroke/StrokeTesselator.h
+++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.h
@@ -38,7 +38,7 @@ class StrokeTesselator
 {
 public:
 
-  inline StrokeTesselator() {_Material.SetDiffuse(0,0,0,1);_overloadMaterial=false;}
+  inline StrokeTesselator() {_Material.setDiffuse(0,0,0,1);_overloadMaterial=false;}
   virtual ~StrokeTesselator() {}
 
   /*! Builds a line rep contained from a Stroke
@@ -54,7 +54,7 @@ public:
 
   
   
-  inline void SetMaterial(const Material& iMaterial) {_Material=iMaterial;_overloadMaterial=true;}
+  inline void setMaterial(const Material& iMaterial) {_Material=iMaterial;_overloadMaterial=true;}
   inline const Material& material() const {return _Material;}
 
 private: