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

8 files changed, 59 insertions, 32 deletions

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