Merge branch 'master' into temp-gpencil-drw-enginetemp-gpencil-drw-engine

1 files changed, 6 insertions, 3 deletions

diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h
index f4fd2b132e8..263b5429161 100644
--- a/source/blender/freestyle/intern/stroke/Stroke.h
+++ b/source/blender/freestyle/intern/stroke/Stroke.h
@@ -590,7 +590,8 @@ class Stroke : public Interface1D {
   /*! Resampling method.
    *  Resamples the curve so that it eventually has iNPoints. That means it is going to add
    * iNPoints-vertices_size, if vertices_size is the number of points we already have. If
-   * vertices_size >= iNPoints, no resampling is done. \param iNPoints: The number of vertices we
+   * vertices_size >= iNPoints, no resampling is done.
+   * \param iNPoints: The number of vertices we
    * eventually want in our stroke.
    */
   int Resample(int iNPoints);
@@ -840,8 +841,10 @@ class Stroke : public Interface1D {
   vertex_iterator vertices_end();
 
   /*! Returns a StrokeVertexIterator pointing on the first StrokeVertex of the Stroke. One can
-   * specify a sampling value to resample the Stroke on the fly if needed. \param t: The resampling
-   * value with which we want our Stroke to be resampled. If 0 is specified, no resampling is done.
+   * specify a sampling value to resample the Stroke on the fly if needed.
+   *
+   * \param t: The resampling value with which we want our Stroke to be resampled.
+   * If 0 is specified, no resampling is done.
    */
   StrokeInternal::StrokeVertexIterator strokeVerticesBegin(float t = 0.0f);