1 files changed, 9 insertions, 13 deletions
diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
index 36234ad619c..335bfdffe90 100644
--- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
+++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
@@ -40,9 +40,7 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
-namespace Freestyle {
-
-namespace StrokeShaders {
+namespace Freestyle::StrokeShaders {
 
 //
 //  Thickness modifiers
@@ -170,13 +168,13 @@ int LengthDependingThicknessShader::shade(Stroke &stroke) const
 
 static const unsigned NB_VALUE_NOISE = 512;
 
-ThicknessNoiseShader::ThicknessNoiseShader() : StrokeShader()
+ThicknessNoiseShader::ThicknessNoiseShader()
 {
   _amplitude = 1.0f;
   _scale = 1.0f / 2.0f / (float)NB_VALUE_NOISE;
 }
 
-ThicknessNoiseShader::ThicknessNoiseShader(float iAmplitude, float iPeriod) : StrokeShader()
+ThicknessNoiseShader::ThicknessNoiseShader(float iAmplitude, float iPeriod)
 {
   _amplitude = iAmplitude;
   _scale = 1.0f / iPeriod / (float)NB_VALUE_NOISE;
@@ -256,13 +254,13 @@ int MaterialColorShader::shade(Stroke &stroke) const
   return 0;
 }
 
-ColorNoiseShader::ColorNoiseShader() : StrokeShader()
+ColorNoiseShader::ColorNoiseShader()
 {
   _amplitude = 1.0f;
   _scale = 1.0f / 2.0f / (float)NB_VALUE_NOISE;
 }
 
-ColorNoiseShader::ColorNoiseShader(float iAmplitude, float iPeriod) : StrokeShader()
+ColorNoiseShader::ColorNoiseShader(float iAmplitude, float iPeriod)
 {
   _amplitude = iAmplitude;
   _scale = 1.0f / iPeriod / (float)NB_VALUE_NOISE;
@@ -384,13 +382,13 @@ int BezierCurveShader::shade(Stroke &stroke) const
   // Build the Bezier curve from this set of data points:
   vector<Vec2d> data;
   StrokeInternal::StrokeVertexIterator v = stroke.strokeVerticesBegin(), vend;
-  data.push_back(Vec2d(v->x(), v->y()));  // first one
+  data.emplace_back(v->x(), v->y());  // first one
   StrokeInternal::StrokeVertexIterator previous = v;
   ++v;
   for (vend = stroke.strokeVerticesEnd(); v != vend; ++v) {
     if (!((fabs(v->x() - (previous)->x()) < M_EPSILON) &&
           ((fabs(v->y() - (previous)->y()) < M_EPSILON)))) {
-      data.push_back(Vec2d(v->x(), v->y()));
+      data.emplace_back(v->x(), v->y());
     }
     previous = v;
   }
@@ -646,7 +644,7 @@ int GuidingLinesShader::shade(Stroke &stroke) const
 //
 /////////////////////////////////////////
 
-TipRemoverShader::TipRemoverShader(real tipLength) : StrokeShader()
+TipRemoverShader::TipRemoverShader(real tipLength)
 {
   _tipLength = tipLength;
 }
@@ -697,6 +695,4 @@ int TipRemoverShader::shade(Stroke &stroke) const
   return 0;
 }
 
-}  // end of namespace StrokeShaders
-
-} /* namespace Freestyle */
+}  // namespace Freestyle::StrokeShaders