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

8 files changed, 29 insertions, 17 deletions

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 &);