Merge branch 'master' into blender2.8

1 files changed, 3 insertions, 3 deletions

diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h
index c004d73e6fe..83e6a947917 100644
--- a/source/blender/freestyle/intern/stroke/Stroke.h
+++ b/source/blender/freestyle/intern/stroke/Stroke.h
@@ -564,7 +564,7 @@ public:
 	 *    \param iBegin
 	 *      The iterator pointing to the first vertex.
 	 *    \param iEnd
-	 *      The iterator pointing to the end of the vertex list. 
+	 *      The iterator pointing to the end of the vertex list.
 	 */
 	template<class InputVertexIterator>
 	Stroke(InputVertexIterator iBegin, InputVertexIterator iEnd);
@@ -600,7 +600,7 @@ public:
 	 *  Resamples the curve with a given sampling.
 	 *  If this sampling is < to the actual sampling value, no resampling is done.
 	 *  \param iSampling
-	 *    The new sampling value.  
+	 *    The new sampling value.
 	 */
 	int Resample(float iSampling);
 
@@ -608,7 +608,7 @@ public:
 	 */
 	void RemoveAllVertices();
 
-	/*! Removes the stroke vertex iVertex 
+	/*! Removes the stroke vertex iVertex
 	 *  from the stroke.
 	 *  The length and curvilinear abscissa are updated
 	 *  consequently.