Cleanup: style, use braces in source/ (include disabled blocks)

31 files changed, 257 insertions, 137 deletions

diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp
index 654c0cb30c8..ef05d0a3a8f 100644
--- a/source/blender/freestyle/intern/application/Controller.cpp
+++ b/source/blender/freestyle/intern/application/Controller.cpp
@@ -144,14 +144,16 @@ Controller::~Controller()
 #if 0
   if (NULL != _SilhouetteNode) {
     int ref = _SilhouetteNode->destroy();
-    if (0 == ref)
+    if (0 == ref) {
       delete _SilhouetteNode;
+    }
   }
 
   if (NULL != _DebugNode) {
     int ref = _DebugNode->destroy();
-    if (0 == ref)
+    if (0 == ref) {
       delete _DebugNode;
+    }
   }
 #endif
 
@@ -447,8 +449,9 @@ void Controller::DeleteViewMap(bool freeCache)
   _pView->DetachDebug();
   if (NULL != _DebugNode) {
     int ref = _DebugNode->destroy();
-    if (0 == ref)
+    if (0 == ref) {
       _DebugNode->addRef();
+    }
   }
 #endif
 
@@ -636,8 +639,9 @@ void Controller::ComputeViewMap()
 void Controller::ComputeSteerableViewMap()
 {
 #if 0  // soc
-  if ((!_Canvas) || (!_ViewMap))
+  if ((!_Canvas) || (!_ViewMap)) {
     return;
+  }
 
   // Build 4 nodes containing the edges in the 4 directions
   NodeGroup *ng[Canvas::NB_STEERABLE_VIEWMAP];
@@ -659,16 +663,18 @@ void Controller::ComputeSteerableViewMap()
   NodeShape *ns;
   for (ViewMap::fedges_container::iterator f = fedges.begin(), fend = fedges.end(); f != fend;
        ++f) {
-    if ((*f)->viewedge()->qi() != 0)
+    if ((*f)->viewedge()->qi() != 0) {
       continue;
+    }
     fRep = new LineRep((*f)->vertexA()->point2d(), (*f)->vertexB()->point2d());
     completeNS->AddRep(fRep);  // add to the complete map anyway
     double *oweights = svm->AddFEdge(*f);
     for (i = 0; i < (Canvas::NB_STEERABLE_VIEWMAP - 1); ++i) {
       ns = new NodeShape;
       double wc = oweights[i] * c;
-      if (oweights[i] == 0)
+      if (oweights[i] == 0) {
         continue;
+      }
       ns->material().setDiffuse(wc, wc, wc, 1);
       ns->AddRep(fRep);
       ng[i]->AddChild(ns);
@@ -1096,12 +1102,14 @@ void Controller::displayDensityCurves(int x, int y)
 
   // display the curves
 #if 0
-  for (i = 0; i < nbCurves; ++i)
+  for (i = 0; i < nbCurves; ++i) {
     _pDensityCurvesWindow->setOrientationCurve(
         i, Vec2d(0, 0), Vec2d(nbPoints, 1), curves[i], "scale", "density");
-  for (i = 1; i <= 8; ++i)
+  }
+  for (i = 1; i <= 8; ++i) {
     _pDensityCurvesWindow->setLevelCurve(
         i, Vec2d(0, 0), Vec2d(nbCurves, 1), curvesDirection[i], "orientation", "density");
+  }
   _pDensityCurvesWindow->show();
 #endif
 }
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index a770251c1fe..8bd4fda8e23 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -319,8 +319,9 @@ void BlenderFileLoader::addTriangle(struct LoaderState *ls,
 
 #if 0
     len = len_v3v3(fv[i], fv[(i + 1) % 3]);
-    if (_minEdgeSize > len)
+    if (_minEdgeSize > len) {
       _minEdgeSize = len;
+    }
 #endif
 
     *ls->pvi = ls->currentIndex;
diff --git a/source/blender/freestyle/intern/geometry/Polygon.h b/source/blender/freestyle/intern/geometry/Polygon.h
index f0e1199d930..b3f47c8ca77 100644
--- a/source/blender/freestyle/intern/geometry/Polygon.h
+++ b/source/blender/freestyle/intern/geometry/Polygon.h
@@ -215,8 +215,9 @@ class Polygon3r : public Polygon<Vec3r> {
                            real epsilon = M_EPSILON) const
   {
 #if 0
-    if (_vertices.size() < 3)
+    if (_vertices.size() < 3) {
       return false;
+    }
 #endif
     return GeomUtils::intersectRayTriangle(
         orig, dir, _vertices[0], _vertices[1], _vertices[2], t, u, v, epsilon);
diff --git a/source/blender/freestyle/intern/geometry/SweepLine.h b/source/blender/freestyle/intern/geometry/SweepLine.h
index 36094bf5086..f31b276d358 100644
--- a/source/blender/freestyle/intern/geometry/SweepLine.h
+++ b/source/blender/freestyle/intern/geometry/SweepLine.h
@@ -55,10 +55,12 @@ template<class Edge> class Intersection {
   /*! returns the parameter giving the intersection, for the edge iEdge */
   real getParameter(Edge *iEdge)
   {
-    if (iEdge == EdgeA)
+    if (iEdge == EdgeA) {
       return tA;
-    if (iEdge == EdgeB)
+    }
+    if (iEdge == EdgeB) {
       return tB;
+    }
     return 0;
   }
 
@@ -131,8 +133,9 @@ template<class T, class Point> class Segment {
 
   inline bool operator==(const Segment<T, Point> &iBrother)
   {
-    if (_edge == iBrother._edge)
+    if (_edge == iBrother._edge) {
       return true;
+    }
     return false;
   }
 
@@ -237,10 +240,12 @@ template<class T, class Point> class SweepLine {
     vector<Segment<T, Point> *> toadd;
     typename vector<Segment<T, Point> *>::iterator s, send;
     for (s = segments.begin(), send = segments.end(); s != send; s++) {
-      if (p == (*(*s))[0])
+      if (p == (*(*s))[0]) {
         toadd.push_back((*s));
-      else
+      }
+      else {
         remove((*s));
+      }
     }
     for (s = toadd.begin(), send = toadd.end(); s != send; s++) {
       add((*s), binrule, epsilon);
@@ -275,8 +280,9 @@ template<class T, class Point> class SweepLine {
          s != send;
          s++) {
       Segment<T, Point> *currentS = (*s);
-      if (true != binrule(*S, *currentS))
+      if (true != binrule(*S, *currentS)) {
         continue;
+      }
 
       if (true == currentS->order()) {
         v2[0] = ((*currentS)[0])[0];
@@ -290,8 +296,9 @@ template<class T, class Point> class SweepLine {
         v2[0] = ((*currentS)[1])[0];
         v2[1] = ((*currentS)[1])[1];
       }
-      if (S->CommonVertex(*currentS, CP))
+      if (S->CommonVertex(*currentS, CP)) {
         continue;  // the two edges have a common vertex->no need to check
+      }
 
       if (GeomUtils::intersect2dSeg2dSegParametric(v0, v1, v2, v3, t, u, epsilon) ==
           GeomUtils::DO_INTERSECT) {
@@ -312,8 +319,9 @@ template<class T, class Point> class SweepLine {
 
   inline void remove(Segment<T, Point> *s)
   {
-    if (s->intersections().size() > 0)
+    if (s->intersections().size() > 0) {
       _IntersectedEdges.push_back(s);
+    }
     _set.remove(s);
   }
 
diff --git a/source/blender/freestyle/intern/geometry/VecMat.h b/source/blender/freestyle/intern/geometry/VecMat.h
index bb12e5b97f0..acc593e8ac9 100644
--- a/source/blender/freestyle/intern/geometry/VecMat.h
+++ b/source/blender/freestyle/intern/geometry/VecMat.h
@@ -868,8 +868,9 @@ template<class T, unsigned N>
 inline Vec<T, N> operator/(const Vec<T, N> &v, const typename Vec<T, N>::value_type r)
 {
   Vec<T, N> res(v);
-  if (r)
+  if (r) {
     res /= r;
+  }
   return res;
 }
 
@@ -878,8 +879,9 @@ template<class T, unsigned N>
 inline typename Vec<T, N>::value_type operator*(const Vec<T, N> &v1, const Vec<T, N> &v2)
 {
   typename Vec<T, N>::value_type sum = 0;
-  for (unsigned int i = 0; i < N; i++)
+  for (unsigned int i = 0; i < N; i++) {
     sum += v1[i] * v2[i];
+  }
   return sum;
 }
 
diff --git a/source/blender/freestyle/intern/scene_graph/SceneHash.h b/source/blender/freestyle/intern/scene_graph/SceneHash.h
index 05a8aadc8c5..cf24c5a21fb 100644
--- a/source/blender/freestyle/intern/scene_graph/SceneHash.h
+++ b/source/blender/freestyle/intern/scene_graph/SceneHash.h
@@ -45,9 +45,9 @@ class SceneHash : public SceneVisitor {
   {
   }
 
-  VISIT_DECL(NodeCamera)
-  VISIT_DECL(NodeViewLayer)
-  VISIT_DECL(IndexedFaceSet)
+  VISIT_DECL(NodeCamera);
+  VISIT_DECL(NodeViewLayer);
+  VISIT_DECL(IndexedFaceSet);
 
   string toString();
 
diff --git a/source/blender/freestyle/intern/scene_graph/SceneVisitor.h b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h
index d1b64663ca9..81a478e8cf3 100644
--- a/source/blender/freestyle/intern/scene_graph/SceneVisitor.h
+++ b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h
@@ -41,12 +41,12 @@ namespace Freestyle {
   { \
   }
 
-#define VISIT_DECL(type) virtual void visit##type(type &);
+#define VISIT_DECL(type) virtual void visit##type(type &)
 
 #define VISIT_COMPLETE_DECL(type) \
   virtual void visit##type##Before(type &); \
   virtual void visit##type(type &); \
-  virtual void visit##type##After(type &);
+  virtual void visit##type##After(type &)
 
 class Node;
 class NodeShape;
diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
index befcaf7dc1d..843395c136c 100644
--- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
+++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
@@ -544,7 +544,7 @@ class CurvePiece {
     int ns1 = ns / 2;
     int ns2 = ns - ns1;
     for (int i = 0; i < ns1; ++it, ++i) {
-      ;
+      /* pass */
     }
 
     CurvePiece *second = new CurvePiece(it, _last, ns2 + 1);
diff --git a/source/blender/freestyle/intern/stroke/Curve.cpp b/source/blender/freestyle/intern/stroke/Curve.cpp
index e1970c7196c..a5d87632ad3 100644
--- a/source/blender/freestyle/intern/stroke/Curve.cpp
+++ b/source/blender/freestyle/intern/stroke/Curve.cpp
@@ -311,15 +311,17 @@ Vec3r CurvePoint::normal() const
 #if 0
 Material CurvePoint::material() const
 {
-  if (__A == 0)
+  if (__A == 0) {
     return __B->material();
+  }
   return __A->material();
 }
 
 Id CurvePoint::shape_id() const
 {
-  if (__A == 0)
+  if (__A == 0) {
     return __B->shape_id();
+  }
   return __A->shape_id();
 }
 #endif
@@ -335,17 +337,20 @@ const SShape *CurvePoint::shape() const
 #if 0
 float CurvePoint::shape_importance() const
 {
-  if (__A == 0)
+  if (__A == 0) {
     return __B->shape_importance();
+  }
   return __A->shape_importance();
 }
 
 const unsigned CurvePoint::qi() const
 {
-  if (__A == 0)
+  if (__A == 0) {
     return __B->qi();
-  if (__B == 0)
+  }
+  if (__B == 0) {
     return __A->qi();
+  }
   return __A->getFEdge(*__B)->qi();
 }
 #endif
@@ -463,19 +468,23 @@ Vec3r shaded_color() const;
 
 Vec3r CurvePoint::orientation2d() const
 {
-  if (__A == 0)
+  if (__A == 0) {
     return __B->orientation2d();
-  if (__B == 0)
+  }
+  if (__B == 0) {
     return __A->orientation2d();
+  }
   return __B->point2d() - __A->point2d();
 }
 
 Vec3r CurvePoint::orientation3d() const
 {
-  if (__A == 0)
+  if (__A == 0) {
     return __B->orientation3d();
-  if (__B == 0)
+  }
+  if (__B == 0) {
     return __A->orientation3d();
+  }
   return __B->point3d() - __A->point3d();
 }
 
@@ -491,10 +500,12 @@ Vec3r CurvePoint::curvature2d_as_vector() const
   Vec3r edgeB = (_FEdges[1])->orientation2d().normalize();
   return edgeA + edgeB;
 #  endif
-  if (__A == 0)
+  if (__A == 0) {
     return __B->curvature2d_as_vector();
-  if (__B == 0)
+  }
+  if (__B == 0) {
     return __A->curvature2d_as_vector();
+  }
   return ((1 - _t2d) * __A->curvature2d_as_vector() + _t2d * __B->curvature2d_as_vector());
 }
 
@@ -509,28 +520,34 @@ real CurvePoint::curvature2d_as_angle() const
   N2.normalize();
   return acos((N1 * N2));
 #  endif
-  if (__A == 0)
+  if (__A == 0) {
     return __B->curvature2d_as_angle();
-  if (__B == 0)
+  }
+  if (__B == 0) {
     return __A->curvature2d_as_angle();
+  }
   return ((1 - _t2d) * __A->curvature2d_as_angle() + _t2d * __B->curvature2d_as_angle());
 }
 
 real CurvePoint::curvatureFredo() const
 {
-  if (__A == 0)
+  if (__A == 0) {
     return __B->curvatureFredo();
-  if (__B == 0)
+  }
+  if (__B == 0) {
     return __A->curvatureFredo();
+  }
   return ((1 - _t2d) * __A->curvatureFredo() + _t2d * __B->curvatureFredo());
 }
 
 Vec2d CurvePoint::directionFredo() const
 {
-  if (__A == 0)
+  if (__A == 0) {
     return __B->directionFredo();
-  if (__B == 0)
+  }
+  if (__B == 0) {
     return __A->directionFredo();
+  }
   return ((1 - _t2d) * __A->directionFredo() + _t2d * __B->directionFredo());
 }
 #endif
@@ -745,8 +762,9 @@ Material Curve::material() const
   const_vertex_iterator v = vertices_begin(), vend = vertices_end();
   const Material &mat = (*v)->material();
   for (; v != vend; ++v) {
-    if ((*v)->material() != mat)
+    if ((*v)->material() != mat) {
       Exception::raiseException();
+    }
   }
   return mat;
 }
@@ -756,8 +774,9 @@ int Curve::qi() const
   const_vertex_iterator v = vertices_begin(), vend = vertices_end();
   int qi_ = (*v)->qi();
   for (; v != vend; ++v) {
-    if ((*v)->qi() != qi_)
+    if ((*v)->qi() != qi_) {
       Exception::raiseException();
+    }
   }
   return qi_;
 }
@@ -782,8 +801,9 @@ bool Curve::occluders_empty() const
   const_vertex_iterator v = vertices_begin(), vend = vertices_end();
   bool empty = (*v)->occluders_empty();
   for (; v != vend; ++v) {
-    if ((*v)->occluders_empty() != empty)
+    if ((*v)->occluders_empty() != empty) {
       Exception::raiseException();
+    }
   }
   return empty;
 }
@@ -798,8 +818,9 @@ const SShape *Curve::occluded_shape() const
   const_vertex_iterator v = vertices_begin(), vend = vertices_end();
   const SShape *sshape = (*v)->occluded_shape();
   for (; v != vend; ++v) {
-    if ((*v)->occluded_shape() != sshape)
+    if ((*v)->occluded_shape() != sshape) {
       Exception::raiseException();
+    }
   }
   return sshape;
 }
@@ -809,8 +830,9 @@ const bool Curve::occludee_empty() const
   const_vertex_iterator v = vertices_begin(), vend = vertices_end();
   bool empty = (*v)->occludee_empty();
   for (; v != vend; ++v) {
-    if ((*v)->occludee_empty() != empty)
+    if ((*v)->occludee_empty() != empty) {
       Exception::raiseException();
+    }
   }
   return empty;
 }
@@ -824,8 +846,9 @@ int Curve::shape_id() const
   const_vertex_iterator v = vertices_begin(), vend = vertices_end();
   Id id = (*v)->shape_id();
   for (; v != vend; ++v) {
-    if ((*v)->shape_id() != id)
+    if ((*v)->shape_id() != id) {
       Exception::raiseException();
+    }
   }
   return id.first;
 }
@@ -835,8 +858,9 @@ const SShape *Curve::shape() const
   const_vertex_iterator v = vertices_begin(), vend = vertices_end();
   const SShape *sshape = (*v)->shape();
   for (; v != vend; ++v) {
-    if ((*v)->shape() != sshape)
+    if ((*v)->shape() != sshape) {
       Exception::raiseException();
+    }
   }
   return sshape;
 }
@@ -915,8 +939,9 @@ void Curve::computeCurvatureAndOrientation()
   for (; v ! = vend; ++v) {
     v2 = v;
     ++v2;
-    if (v2 == vend)
+    if (v2 == vend) {
       break;
+    }
     Vec3r p2 = (*v2)->point2d();
 
     Vec2d BA = p0 - p1;
@@ -930,10 +955,12 @@ void Curve::computeCurvatureAndOrientation()
 
     normal.normalizeSafe();
     real curvature = normalCurvature * normal;
-    if (lba + lbc > MY_EPSILON)
+    if (lba + lbc > MY_EPSILON) {
       curvature /= (0.5 * lba + lbc);
-    if (dir.norm() < MY_EPSILON)
+    }
+    if (dir.norm() < MY_EPSILON) {
       dir = 0.1 * prevDir;
+    }
     (*v)->setCurvatureFredo(curvature);
     (*v)->setDirectionFredo(dir);
 
@@ -975,8 +1002,9 @@ void Curve::computeCurvatureAndOrientation()
   for (; v != vend; ++v) {
     v2 = v;
     ++v2;
-    if (v2 == vend)
+    if (v2 == vend) {
       break;
+    }
     Vec3r p2 = (*v2)->point2d();
 
     Vec2d BA = p0 - p1;
diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp
index 329b5440fed..84d2d3315f1 100644
--- a/source/blender/freestyle/intern/stroke/Operators.cpp
+++ b/source/blender/freestyle/intern/stroke/Operators.cpp
@@ -226,8 +226,9 @@ void Operators::bidirectionalChain(ViewEdgeIterator &it,
                                    UnaryPredicate1D &pred,
                                    UnaryFunction1D_void &modifier)
 {
-  if (_current_view_edges_set.empty())
+  if (_current_view_edges_set.empty()) {
     return;
+  }
 
   unsigned id = 0;
   ViewEdge *edge;
@@ -236,8 +237,9 @@ void Operators::bidirectionalChain(ViewEdgeIterator &it,
   for (I1DContainer::iterator it_edge = _current_view_edges_set.begin();
        it_edge != _current_view_edges_set.end();
        ++it_edge) {
-    if (pred(**it_edge))
+    if (pred(**it_edge)) {
       continue;
+    }
 
     edge = dynamic_cast<ViewEdge *>(*it_edge);
     it.setBegin(edge);
@@ -266,14 +268,16 @@ void Operators::bidirectionalChain(ViewEdgeIterator &it,
     _current_chains_set.push_back(new_chain);
   }
 
-  if (!_current_chains_set.empty())
+  if (!_current_chains_set.empty()) {
     _current_set = &_current_chains_set;
+  }
 }
 
 void Operators::bidirectionalChain(ViewEdgeIterator &it, UnaryPredicate1D &pred)
 {
-  if (_current_view_edges_set.empty())
+  if (_current_view_edges_set.empty()) {
     return;
+  }
 
   unsigned id = 0;
   Functions1D::IncrementChainingTimeStampF1D ts;
@@ -285,8 +289,9 @@ void Operators::bidirectionalChain(ViewEdgeIterator &it, UnaryPredicate1D &pred)
   for (I1DContainer::iterator it_edge = _current_view_edges_set.begin();
        it_edge != _current_view_edges_set.end();
        ++it_edge) {
-    if (pred(**it_edge) || pred_ts(**it_edge))
+    if (pred(**it_edge) || pred_ts(**it_edge)) {
       continue;
+    }
 
     edge = dynamic_cast<ViewEdge *>(*it_edge);
     it.setBegin(edge);
@@ -315,8 +320,9 @@ void Operators::bidirectionalChain(ViewEdgeIterator &it, UnaryPredicate1D &pred)
     _current_chains_set.push_back(new_chain);
   }
 
-  if (!_current_chains_set.empty())
+  if (!_current_chains_set.empty()) {
     _current_set = &_current_chains_set;
+  }
 }
 #endif
 
diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp
index 13f8080552b..d18de1a7073 100644
--- a/source/blender/freestyle/intern/stroke/Stroke.cpp
+++ b/source/blender/freestyle/intern/stroke/Stroke.cpp
@@ -869,8 +869,9 @@ Stroke::const_vertex_iterator Stroke::vertices_last() const
 Stroke::vertex_container::reverse_iterator Stroke::vertices_last(float sampling)
 {
   // Resample if necessary
-  if (sampling < _sampling)
+  if (sampling < _sampling) {
     Resample(sampling);
+  }
   return _Vertices.rbegin();
 }
 
@@ -901,8 +902,9 @@ Material Stroke::material() const
   const_vertex_iterator v = vertices_begin(), vend = strokeVerticesEnd();
   Material mat = (*v)->material();
   for (; v != vend; ++v) {
-    if (mat != (*v)->material())
+    if (mat != (*v)->material()) {
       Exception::raiseException();
+    }
   }
   return mat;
 }
@@ -912,8 +914,9 @@ int Stroke::qi() const
   const_vertex_iterator v = vertices_begin(), vend = vertices_end();
   int qi_ = (*v)->qi();
   for (; v != vend; ++v) {
-    if ((*v)->qi() != qi_)
+    if ((*v)->qi() != qi_) {
       Exception::raiseException();
+    }
   }
   return qi_;
 }
@@ -938,8 +941,9 @@ bool Stroke::occluders_empty() const
   const_vertex_iterator v = vertices_begin(), vend = vertices_end();
   bool empty = (*v)->occluders_empty();
   for (; v != vend; ++v) {
-    if ((*v)->occluders_empty() != empty)
+    if ((*v)->occluders_empty() != empty) {
       Exception::raiseException();
+    }
   }
   return empty;
 }
@@ -956,8 +960,9 @@ const SShape *Stroke::occluded_shape() const
   const_vertex_iterator v = vertices_begin(), vend = vertices_end();
   const SShape *sshape = (*v)->occluded_shape();
   for (; v != vend; ++v) {
-    if ((*v)->occluded_shape() != sshape)
+    if ((*v)->occluded_shape() != sshape) {
       Exception::raiseException();
+    }
   }
   return sshape;
 }
@@ -967,8 +972,9 @@ const bool Stroke::occludee_empty() const
   const_vertex_iterator v = vertices_begin(), vend = vertices_end();
   bool empty = (*v)->occludee_empty();
   for (; v != vend; ++v) {
-    if ((*v)->occludee_empty() != empty)
+    if ((*v)->occludee_empty() != empty) {
       Exception::raiseException();
+    }
   }
   return empty;
 }
@@ -978,8 +984,9 @@ const SShape *Stroke::shape() const
   const_vertex_iterator v = vertices_begin(), vend = vertices_end();
   const SShape *sshape = (*v)->shape();
   for (; v != vend; ++v) {
-    if ((*v)->shape() != sshape)
+    if ((*v)->shape() != sshape) {
       Exception::raiseException();
+    }
   }
   return sshape;
 }
diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.cpp b/source/blender/freestyle/intern/stroke/StrokeRep.cpp
index 3b309a9d249..aaf8a4b7ef5 100644
--- a/source/blender/freestyle/intern/stroke/StrokeRep.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeRep.cpp
@@ -174,17 +174,21 @@ void Strip::createStrip(const vector<StrokeVertex *> &iStrokeVertices)
     real orientation = o1 * o2;
     if (orientation > 0) {
       // then the vertex to move is v0
-      if (o1 > 0)
+      if (o1 > 0) {
         _vertex[0] = _vertex[1] + userDir;
-      else
+      }
+      else {
         _vertex[0] = _vertex[1] - userDir;
+      }
     }
     if (orientation < 0) {
       // then we must move v1
-      if (o1 < 0)
+      if (o1 < 0) {
         _vertex[1] = _vertex[0] + userDir;
-      else
+      }
+      else {
         _vertex[1] = _vertex[0] - userDir;
+      }
     }
   }
 #endif
@@ -336,17 +340,21 @@ void Strip::createStrip(const vector<StrokeVertex *> &iStrokeVertices)
     real orientation = o1 * o2;
     if (orientation > 0) {
       // then the vertex to move is vn
-      if (o1 < 0)
+      if (o1 < 0) {
         _vertex[n] = _vertex[n - 1] + userDir;
-      else
+      }
+      else {
         _vertex[n] = _vertex[n - 1] - userDir;
+      }
     }
     if (orientation < 0) {
       // then we must move vn-1
-      if (o1 > 0)
+      if (o1 > 0) {
         _vertex[n - 1] = _vertex[n] + userDir;
-      else
+      }
+      else {
         _vertex[n - 1] = _vertex[n] - userDir;
+      }
     }
   }
 #endif
@@ -715,18 +723,22 @@ void Strip::computeTexCoordWithTips(const vector<StrokeVertex *> &iStrokeVertice
 #if 0
   cerr << "u=" << u << "    i=" << i << "/" << _sizeStrip << endl;
 
-  for (i = 0; i < _sizeStrip; i++)
+  for (i = 0; i < _sizeStrip; i++) {
     _alpha[i] = 1.0;
+  }
 
-  for (i = 0; i < _sizeStrip; i++)
+  for (i = 0; i < _sizeStrip; i++) {
     cerr << "(" << _texCoord[i][0] << ", " << _texCoord[i][1] << ") ";
+  }
   cerr << endl;
 
   Vec2r vec_tmp;
-  for (i = 0; i < _sizeStrip / 2; i++)
+  for (i = 0; i < _sizeStrip / 2; i++) {
     vec_tmp = _vertex[2 * i] - _vertex[2 * i + 1];
-  if (vec_tmp.norm() > 4 * _averageThickness)
+  }
+  if (vec_tmp.norm() > 4 * _averageThickness) {
     cerr << "Warning (from Fredo): There is a pb in the texture coordinates computation" << endl;
+  }
 #endif
 }
 
@@ -750,10 +762,12 @@ StrokeRep::StrokeRep()
   }
 #if 0
   _averageTextureAlpha = 0.5;  //default value
-  if (_strokeType == OIL_STROKE)
+  if (_strokeType == OIL_STROKE) {
     _averageTextureAlpha = 0.75;
-  if (_strokeType >= NO_BLEND_STROKE)
-    _averageTextureAlpha = 1.0
+  }
+  if (_strokeType >= NO_BLEND_STROKE) {
+    _averageTextureAlpha = 1.0;
+  }
 #endif
 }
 
@@ -782,10 +796,12 @@ StrokeRep::StrokeRep(Stroke *iStroke)
 
 #if 0
   _averageTextureAlpha = 0.5;  //default value
-  if (_strokeType == OIL_STROKE)
+  if (_strokeType == OIL_STROKE) {
     _averageTextureAlpha = 0.75;
-  if (_strokeType >= NO_BLEND_STROKE)
+  }
+  if (_strokeType >= NO_BLEND_STROKE) {
     _averageTextureAlpha = 1.0;
+  }
 #endif
   create();
 }
diff --git a/source/blender/freestyle/intern/system/Cast.h b/source/blender/freestyle/intern/system/Cast.h
index 8318633c4b5..44fd86a9b43 100644
--- a/source/blender/freestyle/intern/system/Cast.h
+++ b/source/blender/freestyle/intern/system/Cast.h
@@ -27,8 +27,9 @@ namespace Freestyle {
 namespace Cast {
 template<class T, class U> U *cast(T *in)
 {
-  if (!in)
+  if (!in) {
     return NULL;
+  }
   return dynamic_cast<U *>(in);
 }
 }  // end of namespace Cast
diff --git a/source/blender/freestyle/intern/system/Id.h b/source/blender/freestyle/intern/system/Id.h
index 9a83ae27767..549def6cabb 100644
--- a/source/blender/freestyle/intern/system/Id.h
+++ b/source/blender/freestyle/intern/system/Id.h
@@ -112,10 +112,12 @@ class Id {
   /*! Operator< */
   bool operator<(const Id &id) const
   {
-    if (_first < id._first)
+    if (_first < id._first) {
       return true;
-    if (_first == id._first && _second < id._second)
+    }
+    if (_first == id._first && _second < id._second) {
       return true;
+    }
     return false;
   }
 
diff --git a/source/blender/freestyle/intern/system/RenderMonitor.h b/source/blender/freestyle/intern/system/RenderMonitor.h
index 8058ab1b7ff..709df6c2d8e 100644
--- a/source/blender/freestyle/intern/system/RenderMonitor.h
+++ b/source/blender/freestyle/intern/system/RenderMonitor.h
@@ -54,8 +54,9 @@ class RenderMonitor {
 
   inline void progress(float i)
   {
-    if (_re)
+    if (_re) {
       _re->progress(_re->prh, i);
+    }
   }
 
   inline bool testBreak()
diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
index faa219beb9c..5c3ba1c3db3 100644
--- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
+++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
@@ -472,8 +472,9 @@ void FEdgeXDetector::ProcessRidgeFace(WXFace *iFace)
 
   // find the ridge layer of the face
   iFace->retrieveSmoothLayers(Nature::RIDGE, SmoothLayers);
-  if (SmoothLayers.size() != 1)
+  if (SmoothLayers.size() != 1) {
     return;
+  }
   faceLayer = SmoothLayers[0];
   // retrieve the curvature info of this layer
   layer_info = (Face_Curvature_Info *)faceLayer->userdata;
@@ -491,8 +492,9 @@ void FEdgeXDetector::ProcessRidgeFace(WXFace *iFace)
     for (; fit != fitend; ++fit) {
       WXFace *wxf = dynamic_cast<WXFace *>(*fit);
       WOEdge *oppositeEdge;
-      if (!(wxf->getOppositeEdge(v, oppositeEdge)))
+      if (!(wxf->getOppositeEdge(v, oppositeEdge))) {
         continue;
+      }
       v1v2 = oppositeEdge->GetbVertex()->GetVertex() - oppositeEdge->GetaVertex()->GetVertex();
       GeomUtils::intersection_test res;
       res = GeomUtils::intersectRayPlane(
@@ -500,8 +502,9 @@ void FEdgeXDetector::ProcessRidgeFace(WXFace *iFace)
       if ((res == GeomUtils::DO_INTERSECT) && (t >= 0.0) && (t <= 1.0)) {
         vector<WXFaceLayer *> second_ridge_layer;
         wxf->retrieveSmoothLayers(Nature::RIDGE, second_ridge_layer);
-        if (second_ridge_layer.size() != 1)
+        if (second_ridge_layer.size() != 1) {
           continue;
+        }
         Face_Curvature_Info *second_layer_info =
             (Face_Curvature_Info *)second_ridge_layer[0]->userdata;
 
@@ -542,12 +545,14 @@ void FEdgeXDetector::ProcessRidgeFace(WXFace *iFace)
   e1.normalize();
   Vec3r e2((layer_info->vec_curvature_info[2]->K1 * layer_info->vec_curvature_info[2]->e1));
   e2.normalize();
-  if (e0 * e1 < 0)
+  if (e0 * e1 < 0) {
     // invert dotP[1]
     faceLayer->ReplaceDotP(1, -faceLayer->dotP(1));
-  if (e0 * e2 < 0)
+  }
+  if (e0 * e2 < 0) {
     // invert dotP[2]
     faceLayer->ReplaceDotP(2, -faceLayer->dotP(2));
+  }
 
 #  if 0  // remove the weakest values;
   real minDiff = (_maxK1 - _minK1) / 10.0;
diff --git a/source/blender/freestyle/intern/view_map/Silhouette.cpp b/source/blender/freestyle/intern/view_map/Silhouette.cpp
index 49da675b932..63c4fc8d5da 100644
--- a/source/blender/freestyle/intern/view_map/Silhouette.cpp
+++ b/source/blender/freestyle/intern/view_map/Silhouette.cpp
@@ -355,11 +355,13 @@ real FEdge::local_average_density(float sigma, int iCombination) const
 Vec3r FEdge::normal(int &oException /* = Exception::NO_EXCEPTION */)
 {
   Vec3r Na = _VertexA->normal(oException);
-  if (oException != Exception::NO_EXCEPTION)
+  if (oException != Exception::NO_EXCEPTION) {
     return Na;
+  }
   Vec3r Nb = _VertexB->normal(oException);
-  if (oException != Exception::NO_EXCEPTION)
+  if (oException != Exception::NO_EXCEPTION) {
     return Nb;
+  }
   return (Na + Nb) / 2.0;
 }
 
diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
index 862b4e479fa..bc2597c02d5 100644
--- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
@@ -295,8 +295,9 @@ void SteerableViewMap::saveSteerableViewMap() const
       for (unsigned int y = 0; y < oh; ++y) {
         for (unsigned int x = 0; x < ow; ++x) {
           int c = (int)(coeff * img->pixel(x, y));
-          if (c > 255)
+          if (c > 255) {
             c = 255;
+          }
           //int c = (int)(_imagesPyramids[i]->pixel(x, y, j));
           qtmp.setPixel(x, y, qRgb(c, c, c));
         }
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.cpp b/source/blender/freestyle/intern/view_map/ViewMap.cpp
index 0d52b88118b..9acd730d062 100644
--- a/source/blender/freestyle/intern/view_map/ViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMap.cpp
@@ -348,7 +348,7 @@ void TVertex::setFrontEdgeA(ViewEdge *iFrontEdgeA, bool incoming)
   if (!_sortedEdges.empty()) {
     edge_pointers_container::iterator dve = _sortedEdges.begin(), dveend = _sortedEdges.end();
     for (; (dve != dveend) && ViewEdgeComp(**dve, _FrontEdgeA); ++dve) {
-      ;
+      /* pass */
     }
     _sortedEdges.insert(dve, &_FrontEdgeA);
   }
@@ -367,7 +367,7 @@ void TVertex::setFrontEdgeB(ViewEdge *iFrontEdgeB, bool incoming)
   if (!_sortedEdges.empty()) {
     edge_pointers_container::iterator dve = _sortedEdges.begin(), dveend = _sortedEdges.end();
     for (; (dve != dveend) && ViewEdgeComp(**dve, _FrontEdgeB); ++dve) {
-      ;
+      /* pass */
     }
     _sortedEdges.insert(dve, &_FrontEdgeB);
   }
@@ -405,7 +405,7 @@ void TVertex::setBackEdgeB(ViewEdge *iBackEdgeB, bool incoming)
   if (!_sortedEdges.empty()) {
     edge_pointers_container::iterator dve = _sortedEdges.begin(), dveend = _sortedEdges.end();
     for (; (dve != dveend) && ViewEdgeComp(**dve, _BackEdgeB); ++dve) {
-      ;
+      /* pass */
     }
     _sortedEdges.insert(dve, &_BackEdgeB);
   }
@@ -476,14 +476,18 @@ ViewVertex::edge_iterator TVertex::edges_iterator(ViewEdge *iEdge)
 
 #if 0
   directedViewEdge dEdge;
-  if (_FrontEdgeA.first == iEdge)
+  if (_FrontEdgeA.first == iEdge) {
     dEdge = _FrontEdgeA;
-  else if (_FrontEdgeB.first == iEdge)
+  }
+  else if (_FrontEdgeB.first == iEdge) {
     dEdge = _FrontEdgeB;
-  else if (_BackEdgeA.first == iEdge)
+  }
+  else if (_BackEdgeA.first == iEdge) {
     dEdge = _BackEdgeA;
-  else if (_BackEdgeB.first == iEdge)
+  }
+  else if (_BackEdgeB.first == iEdge) {
     dEdge = _BackEdgeB;
+  }
   return edge_iterator(_FrontEdgeA, _FrontEdgeB, _BackEdgeA, _BackEdgeB, dEdge);
 #endif
 }
@@ -502,14 +506,18 @@ ViewVertex::const_edge_iterator TVertex::edges_iterator(ViewEdge *iEdge) const
 
 #if 0
   directedViewEdge dEdge;
-  if (_FrontEdgeA.first == iEdge)
+  if (_FrontEdgeA.first == iEdge) {
     dEdge = _FrontEdgeA;
-  else if (_FrontEdgeB.first == iEdge)
+  }
+  else if (_FrontEdgeB.first == iEdge) {
     dEdge = _FrontEdgeB;
-  else if (_BackEdgeA.first == iEdge)
+  }
+  else if (_BackEdgeA.first == iEdge) {
     dEdge = _BackEdgeA;
-  else if (_BackEdgeB.first == iEdge)
+  }
+  else if (_BackEdgeB.first == iEdge) {
     dEdge = _BackEdgeB;
+  }
   return const_edge_iterator(_FrontEdgeA, _FrontEdgeB, _BackEdgeA, _BackEdgeB, dEdge);
 #endif
 }
@@ -571,7 +579,7 @@ void NonTVertex::AddIncomingViewEdge(ViewEdge *iVEdge)
   if (!_ViewEdges.empty()) {
     edges_container::iterator dve = _ViewEdges.begin(), dveend = _ViewEdges.end();
     for (; (dve != dveend) && ViewEdgeComp(*dve, idve); ++dve) {
-      ;
+      /* pass */
     }
     _ViewEdges.insert(dve, idve);
   }
diff --git a/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h
index 0ccf0d382a2..525073af919 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h
@@ -295,12 +295,15 @@ class edge_iterator_base : public IteratorBase<Traits, InputIteratorTag_Traits>
           return;
         }
 
-        if (_tvertex_iter.first == _feA.first)
+        if (_tvertex_iter.first == _feA.first) {
           _tvertex_iter.first = _beB.first;
-        else if (_tvertex_iter.first == _beB.first)
+        }
+        else if (_tvertex_iter.first == _beB.first) {
           _tvertex_iter.first = 0;
-        else
+        }
+        else {
           _tvertex_iter.first = _feA.first;
+        }
         return;
       }
       if (_feA.first == _beB.first) {
@@ -309,12 +312,15 @@ class edge_iterator_base : public IteratorBase<Traits, InputIteratorTag_Traits>
           return;
         }
 
-        if (_tvertex_iter.first == _feB.first)
+        if (_tvertex_iter.first == _feB.first) {
           _tvertex_iter.first = _beA.first;
-        else if (_tvertex_iter.first == _beA.first)
+        }
+        else if (_tvertex_iter.first == _beA.first) {
           _tvertex_iter.first = 0;
-        else
+        }
+        else {
           _tvertex_iter.first = _feB.first;
+        }
         return;
       }
       // End of hack
diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
index fb237a9c2ca..aaab3936fa6 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
@@ -152,7 +152,7 @@ static void findOccludee(FEdge *fe,
         }
 #endif
         if (fabs(v * p->getNormal()) > 0.0001) {
-          if ((t > 0.0)) {  // && (t<1.0))
+          if ((t > 0.0) /* && (t<1.0) */) {
             if (t < mint) {
               *oaWFace = oface;
               mint = t;
@@ -1820,7 +1820,9 @@ void ViewMapBuilder::ComputeFastRayCastingVisibility(ViewMap *ioViewMap, real ep
         }
         if (sameShape)
 #endif
-        (*ve)->setaShape(vshape);
+        {
+          (*ve)->setaShape(vshape);
+        }
       }
     }
 
@@ -2490,10 +2492,12 @@ void ViewMapBuilder::ComputeSweepLineIntersections(ViewMap *ioViewMap, real epsi
         printf("b1 %e, %e -- b2 %e, %e\n", b1[0], b1[1], b2[0], b2[1]);
         //printf("line([%e, %e], [%e, %e]);\n", a1[0], a2[0], a1[1], a2[1]);
         //printf("line([%e, %e], [%e, %e]);\n", b1[0], b2[0], b1[1], b2[1]);
-        if ((Ta < -epsilon) || (Ta > 1 + epsilon))
+        if ((Ta < -epsilon) || (Ta > 1 + epsilon)) {
           printf("Ta %.12e\n", Ta);
-        if ((Tb < -epsilon) || (Tb > 1 + epsilon))
+        }
+        if ((Tb < -epsilon) || (Tb > 1 + epsilon)) {
           printf("Tb %.12e\n", Tb);
+        }
         printf("A1 %e, %e, %e -- A2 %e, %e, %e\n", A1[0], A1[1], A1[2], A2[0], A2[1], A2[2]);
         printf("B1 %e, %e, %e -- B2 %e, %e, %e\n", B1[0], B1[1], B1[2], B2[0], B2[1], B2[2]);
       }
diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
index f844a227ec5..4c4e5ce7fe9 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
@@ -819,7 +819,7 @@ static int save(ostream &out, SVertex *sv)
   // we have to hack it...
   set<Vec3r>::const_iterator i;
   for (i = sv->normals().begin(), tmp = 0; i != sv->normals().end(); i++, tmp++) {
-    ;
+    /* pass */
   }
   WRITE(tmp);
   for (i = sv->normals().begin(); i != sv->normals().end(); i++) {
diff --git a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
index 7bb9d649e5d..1b99c270095 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
@@ -180,8 +180,9 @@ NodeGroup *ViewMapTesselator::Tesselate(ViewEdgesIterator begin, ViewEdgesIterat
     firstEdge = (*c)->fedgeA();
 
 #if 0
-    if (firstEdge->invisibility() > 0)
+    if (firstEdge->invisibility() > 0) {
       continue;
+    }
 #endif
 
     line = new OrientedLineRep();
diff --git a/source/blender/freestyle/intern/winged_edge/Curvature.cpp b/source/blender/freestyle/intern/winged_edge/Curvature.cpp
index 4f2f2dae9af..a293d2da62b 100644
--- a/source/blender/freestyle/intern/winged_edge/Curvature.cpp
+++ b/source/blender/freestyle/intern/winged_edge/Curvature.cpp
@@ -149,8 +149,9 @@ bool gts_vertex_mean_curvature_normal(WVertex *v, Vec3r &Kh)
   for (itE = v->incoming_edges_begin(); itE != v->incoming_edges_end(); itE++) {
     WOEdge *e = (*itE)->getPrevOnFace();
 #if 0
-    if ((e->GetaVertex() == v) || (e->GetbVertex() == v))
+    if ((e->GetaVertex() == v) || (e->GetbVertex() == v)) {
       cerr << "BUG ";
+    }
 #endif
     WVertex *v1 = e->GetaVertex();
     WVertex *v2 = e->GetbVertex();
diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.cpp b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
index d88f7cf5582..d624728250a 100644
--- a/source/blender/freestyle/intern/winged_edge/WEdge.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
@@ -126,8 +126,9 @@ bool WVertex::isBoundary()
     }
   }
 #if 0
-  if (!(*it)->GetaOEdge()->GetaFace())
+  if (!(*it)->GetaOEdge()->GetaFace()) {
     return true;
+  }
 #endif
   _Border = 0;
   return false;
diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h
index 037e21ab4e3..424cd76a6b7 100644
--- a/source/blender/freestyle/intern/winged_edge/WEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.h
@@ -799,8 +799,9 @@ class WFace {
   inline WVertex *GetVertex(unsigned int index)
   {
 #if 0
-    if (index >= _OEdgeList.size())
+    if (index >= _OEdgeList.size()) {
       return NULL;
+    }
 #endif
     return _OEdgeList[index]->GetaVertex();
   }
@@ -846,8 +847,9 @@ class WFace {
   inline WFace *GetBordingFace(int index)
   {
 #if 0
-    if (index >= _OEdgeList.size())
+    if (index >= _OEdgeList.size()) {
       return NULL;
+    }
 #endif
     return _OEdgeList[index]->GetaFace();
   }
@@ -1286,10 +1288,12 @@ class WShape {
          wv++) {
       for (unsigned int i = 0; i < 3; i++) {
         v = (*wv)->GetVertex();
-        if (v[i] < _min[i])
+        if (v[i] < _min[i]) {
           _min[i] = v[i];
-        if (v[i] > _max[i])
+        }
+        if (v[i] > _max[i]) {
           _max[i] = v[i];
+        }
       }
     }
   }
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.cpp b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp
index 566b046bb2c..f11f30130c8 100644
--- a/source/blender/freestyle/intern/winged_edge/WXEdge.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp
@@ -211,19 +211,23 @@ WXSmoothEdge *WXFaceLayer::BuildSmoothEdge()
         if (!front()) {  // is it in the right order ?
           // the order of the WOEdge index is wrong
           woea = _OEdgeList[(i + 1) % numberOfEdges()];
-          if (0 == i)
+          if (0 == i) {
             woeb = _OEdgeList[numberOfEdges() - 1];
-          else
+          }
+          else {
             woeb = _OEdgeList[(i - 1)];
+          }
           ta = 0.0f;
           tb = 1.0f;
         }
         else {
           // the order of the WOEdge index is good
-          if (0 == i)
+          if (0 == i) {
             woea = _OEdgeList[numberOfEdges() - 1];
-          else
+          }
+          else {
             woea = _OEdgeList[(i - 1)];
+          }
           woeb = _OEdgeList[(i + 1) % numberOfEdges()];
           ta = 1.0f;
           tb = 0.0f;
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.h b/source/blender/freestyle/intern/winged_edge/WXEdge.h
index 0e8ca62fba3..e7d5f4ac8f8 100644
--- a/source/blender/freestyle/intern/winged_edge/WXEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WXEdge.h
@@ -494,7 +494,7 @@ class WXFaceLayer {
 #ifdef WITH_CXX_GUARDEDALLOC
   MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WXFaceLayer")
 #endif
-};
+};  // namespace Freestyle
 
 class WXFace : public WFace {
  protected:
diff --git a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
index 08189c5010e..d223cee5e0e 100644
--- a/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
+++ b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
@@ -37,7 +37,7 @@ class WXEdgeBuilder : public WingedEdgeBuilder {
   virtual ~WXEdgeBuilder()
   {
   }
-  VISIT_DECL(IndexedFaceSet)
+  VISIT_DECL(IndexedFaceSet);
 
  protected:
   virtual void buildWVertices(WShape &shape, const float *vertices, unsigned vsize);
diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
index 97e9ec2bfd2..620601df5e7 100644
--- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
@@ -118,10 +118,12 @@ bool WingedEdgeBuilder::buildWShape(WShape &shape, IndexedFaceSet &ifs)
 
 #if 0
   const FrsMaterial *mat = (ifs.frs_material());
-  if (mat)
+  if (mat) {
     shape.setFrsMaterial(*mat);
-  else if (_current_frs_material)
+  }
+  else if (_current_frs_material) {
     shape.setFrsMaterial(*_current_frs_material);
+  }
 #endif
   const IndexedFaceSet::FaceEdgeMark *faceEdgeMarks = ifs.faceEdgeMarks();
 
diff --git a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h
index 78b1bcf645f..5c728dea1d8 100644
--- a/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h
+++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h
@@ -54,9 +54,9 @@ class WingedEdgeBuilder : public SceneVisitor {
     _matrices_stack.clear();
   }
 
-  VISIT_DECL(IndexedFaceSet)
-  VISIT_DECL(NodeShape)
-  VISIT_DECL(NodeTransform)
+  VISIT_DECL(IndexedFaceSet);
+  VISIT_DECL(NodeShape);
+  VISIT_DECL(NodeTransform);
 
   virtual void visitNodeTransformAfter(NodeTransform &);