Cleanup: style, use braces in source/

Automated using clang-tidy.

14 files changed, 116 insertions, 58 deletions

diff --git a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
index 4176a558009..c5a87c3baaf 100644
--- a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
+++ b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
@@ -445,22 +445,29 @@ FrsMaterial &FrsMaterial::operator=(const FrsMaterial &m)
 
 bool FrsMaterial::operator!=(const FrsMaterial &m) const
 {
-  if (Shininess != m.shininess())
+  if (Shininess != m.shininess()) {
     return true;
-  if (Priority != m.priority())
+  }
+  if (Priority != m.priority()) {
     return true;
+  }
 
   for (int i = 0; i < 4; i++) {
-    if (Line[i] != m.line()[i])
+    if (Line[i] != m.line()[i]) {
       return true;
-    if (Diffuse[i] != m.diffuse()[i])
+    }
+    if (Diffuse[i] != m.diffuse()[i]) {
       return true;
-    if (Specular[i] != m.specular()[i])
+    }
+    if (Specular[i] != m.specular()[i]) {
       return true;
-    if (Ambient[i] != m.ambient()[i])
+    }
+    if (Ambient[i] != m.ambient()[i]) {
       return true;
-    if (Emission[i] != m.emission()[i])
+    }
+    if (Emission[i] != m.emission()[i]) {
       return true;
+    }
   }
 
   return false;
diff --git a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
index 7a6b276bc44..42e96df39ef 100644
--- a/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
+++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
@@ -83,8 +83,9 @@ IndexedFaceSet::IndexedFaceSet(float *iVertices,
     _FrsMaterials = 0;
     if (iMaterials) {
       _FrsMaterials = new FrsMaterial *[_MSize];
-      for (unsigned int i = 0; i < _MSize; ++i)
+      for (unsigned int i = 0; i < _MSize; ++i) {
         _FrsMaterials[i] = new FrsMaterial(*(iMaterials[i]));
+      }
     }
     _TSize = iTSize;
     _TexCoords = 0;
@@ -133,8 +134,9 @@ IndexedFaceSet::IndexedFaceSet(float *iVertices,
 
     _MSize = iMSize;
     _FrsMaterials = 0;
-    if (iMaterials)
+    if (iMaterials) {
       _FrsMaterials = iMaterials;
+    }
 
     _TSize = iTSize;
     _TexCoords = iTexCoords;
@@ -152,8 +154,9 @@ IndexedFaceSet::IndexedFaceSet(float *iVertices,
 
     _MISize = iMISize;
     _MIndices = 0;
-    if (iMISize)
+    if (iMISize) {
       _MIndices = iMIndices;
+    }
 
     _TISize = iTISize;
     _TIndices = iTIndices;
@@ -236,8 +239,9 @@ IndexedFaceSet::~IndexedFaceSet()
   }
 
   if (NULL != _FrsMaterials) {
-    for (unsigned int i = 0; i < _MSize; ++i)
+    for (unsigned int i = 0; i < _MSize; ++i) {
       delete _FrsMaterials[i];
+    }
     delete[] _FrsMaterials;
     _FrsMaterials = NULL;
   }
@@ -302,22 +306,28 @@ void IndexedFaceSet::ComputeBBox()
   float *v = _Vertices;
 
   for (unsigned int i = 0; i < (_VSize / 3); ++i) {
-    if (*v > XMax)
+    if (*v > XMax) {
       XMax = *v;
-    if (*v < XMin)
+    }
+    if (*v < XMin) {
       XMin = *v;
+    }
     ++v;
 
-    if (*v > YMax)
+    if (*v > YMax) {
       YMax = *v;
-    if (*v < YMin)
+    }
+    if (*v < YMin) {
       YMin = *v;
+    }
     ++v;
 
-    if (*v > ZMax)
+    if (*v > ZMax) {
       ZMax = *v;
-    if (*v < ZMin)
+    }
+    if (*v < ZMin) {
       ZMin = *v;
+    }
     ++v;
   }
 
diff --git a/source/blender/freestyle/intern/scene_graph/LineRep.cpp b/source/blender/freestyle/intern/scene_graph/LineRep.cpp
index 39be998cb90..a9f0dc5cdd7 100644
--- a/source/blender/freestyle/intern/scene_graph/LineRep.cpp
+++ b/source/blender/freestyle/intern/scene_graph/LineRep.cpp
@@ -38,22 +38,28 @@ void LineRep::ComputeBBox()
   vector<Vec3r>::iterator v;
   for (v = _vertices.begin(); v != _vertices.end(); ++v) {
     // X
-    if ((*v)[0] > XMax)
+    if ((*v)[0] > XMax) {
       XMax = (*v)[0];
-    if ((*v)[0] < XMin)
+    }
+    if ((*v)[0] < XMin) {
       XMin = (*v)[0];
+    }
 
     // Y
-    if ((*v)[1] > YMax)
+    if ((*v)[1] > YMax) {
       YMax = (*v)[1];
-    if ((*v)[1] < YMin)
+    }
+    if ((*v)[1] < YMin) {
       YMin = (*v)[1];
+    }
 
     // Z
-    if ((*v)[2] > ZMax)
+    if ((*v)[2] > ZMax) {
       ZMax = (*v)[2];
-    if ((*v)[2] < ZMin)
+    }
+    if ((*v)[2] < ZMin) {
       ZMin = (*v)[2];
+    }
   }
 
   setBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));
diff --git a/source/blender/freestyle/intern/scene_graph/Node.h b/source/blender/freestyle/intern/scene_graph/Node.h
index 2e0e94ed5de..96072993590 100644
--- a/source/blender/freestyle/intern/scene_graph/Node.h
+++ b/source/blender/freestyle/intern/scene_graph/Node.h
@@ -79,13 +79,16 @@ class Node : public BaseObject {
   /*! Makes the union of _BBox and iBox */
   virtual void AddBBox(const BBox<Vec3r> &iBox)
   {
-    if (iBox.empty())
+    if (iBox.empty()) {
       return;
+    }
 
-    if (_BBox.empty())
+    if (_BBox.empty()) {
       _BBox = iBox;
-    else
+    }
+    else {
       _BBox += iBox;
+    }
   }
 
   /*! Updates the BBox */
diff --git a/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
index ae87b77aee7..ad2310d7875 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
@@ -33,10 +33,12 @@ static void loadIdentity(double *matrix)
   // Build Identity matrix
   for (i = 0; i < 16; ++i) {
     double value;
-    if ((i % 5) == 0)
+    if ((i % 5) == 0) {
       value = 1.0;
-    else
+    }
+    else {
       value = 0;
+    }
     matrix[i] = value;
   }
 }
diff --git a/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.cpp b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.cpp
index 75acccef666..323ec217c33 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.cpp
@@ -31,8 +31,9 @@ void NodeDrawingStyle::accept(SceneVisitor &v)
   v.visitNodeDrawingStyleBefore(*this);
   v.visitDrawingStyle(_DrawingStyle);
   for (vector<Node *>::iterator node = _Children.begin(), end = _Children.end(); node != end;
-       ++node)
+       ++node) {
     (*node)->accept(v);
+  }
   v.visitNodeDrawingStyleAfter(*this);
 }
 
diff --git a/source/blender/freestyle/intern/scene_graph/NodeGroup.cpp b/source/blender/freestyle/intern/scene_graph/NodeGroup.cpp
index 7ea495c4166..4bbb4a6c58a 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeGroup.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeGroup.cpp
@@ -27,8 +27,9 @@ namespace Freestyle {
 
 void NodeGroup::AddChild(Node *iChild)
 {
-  if (NULL == iChild)
+  if (NULL == iChild) {
     return;
+  }
 
   _Children.push_back(iChild);
   iChild->addRef();
@@ -44,8 +45,9 @@ int NodeGroup::destroy()
   int refThis = Node::destroy();
 
   // if refThis != 0, we can't destroy the tree
-  if (0 != refThis)
+  if (0 != refThis) {
     return refThis;
+  }
 
   // If we are here, that means that nobody else needs our NodeGroup and we can destroy it.
   int refCount = 0;
@@ -53,8 +55,9 @@ int NodeGroup::destroy()
 
   for (node = _Children.begin(); node != _Children.end(); ++node) {
     refCount = (*node)->destroy();
-    if (0 == refCount)
+    if (0 == refCount) {
       delete (*node);
+    }
   }
 
   _Children.clear();
@@ -68,8 +71,9 @@ void NodeGroup::accept(SceneVisitor &v)
 
   v.visitNodeGroupBefore(*this);
   for (vector<Node *>::iterator node = _Children.begin(), end = _Children.end(); node != end;
-       ++node)
+       ++node) {
     (*node)->accept(v);
+  }
   v.visitNodeGroupAfter(*this);
 }
 
diff --git a/source/blender/freestyle/intern/scene_graph/NodeShape.cpp b/source/blender/freestyle/intern/scene_graph/NodeShape.cpp
index b16ca3eda33..e55b2fb625f 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeShape.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeShape.cpp
@@ -30,8 +30,9 @@ NodeShape::~NodeShape()
   if (0 != _Shapes.size()) {
     for (rep = _Shapes.begin(); rep != _Shapes.end(); ++rep) {
       int refCount = (*rep)->destroy();
-      if (0 == refCount)
+      if (0 == refCount) {
         delete (*rep);
+      }
     }
 
     _Shapes.clear();
@@ -46,8 +47,9 @@ void NodeShape::accept(SceneVisitor &v)
 
   v.visitNodeShapeBefore(*this);
   vector<Rep *>::iterator rep;
-  for (rep = _Shapes.begin(); rep != _Shapes.end(); ++rep)
+  for (rep = _Shapes.begin(); rep != _Shapes.end(); ++rep) {
     (*rep)->accept(v);
+  }
   v.visitNodeShapeAfter(*this);
 }
 
diff --git a/source/blender/freestyle/intern/scene_graph/NodeShape.h b/source/blender/freestyle/intern/scene_graph/NodeShape.h
index ec7e09d6c88..13ee265ec10 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeShape.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeShape.h
@@ -53,8 +53,9 @@ class NodeShape : public Node {
    */
   virtual void AddRep(Rep *iRep)
   {
-    if (NULL == iRep)
+    if (NULL == iRep) {
       return;
+    }
     _Shapes.push_back(iRep);
     iRep->addRef();
 
diff --git a/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp b/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp
index 5452c233e2c..9bf0fc4f901 100644
--- a/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp
@@ -37,8 +37,9 @@ void NodeTransform::Rotate(real iAngle, real x, real y, real z)
 {
   // Normalize the x,y,z vector;
   real norm = (real)sqrt(x * x + y * y + z * z);
-  if (0 == norm)
+  if (0 == norm) {
     return;
+  }
 
   x /= norm;
   y /= norm;
@@ -72,8 +73,9 @@ void NodeTransform::Rotate(real iAngle, real x, real y, real z)
   R4 = Matrix44r::identity();
 
   for (int i = 0; i < 3; i++) {
-    for (int j = 0; j < 3; j++)
+    for (int j = 0; j < 3; j++) {
       R4(i, j) = R(i, j);
+    }
   }
 
   // Finally, we multiply our current matrix by R4:
@@ -99,8 +101,9 @@ void NodeTransform::MultiplyMatrix(const Matrix44r &iMatrix)
 void NodeTransform::setMatrix(const Matrix44r &iMatrix)
 {
   _Matrix = iMatrix;
-  if (isScaled(iMatrix))
+  if (isScaled(iMatrix)) {
     _Scaled = true;
+  }
 }
 
 void NodeTransform::accept(SceneVisitor &v)
@@ -109,8 +112,9 @@ void NodeTransform::accept(SceneVisitor &v)
 
   v.visitNodeTransformBefore(*this);
   for (vector<Node *>::iterator node = _Children.begin(), end = _Children.end(); node != end;
-       ++node)
+       ++node) {
     (*node)->accept(v);
+  }
   v.visitNodeTransformAfter(*this);
 }
 
@@ -133,17 +137,20 @@ void NodeTransform::AddBBox(const BBox<Vec3r> &iBBox)
   // Computes the transform iBBox
   HVec3r tbox[8];
   unsigned int i;
-  for (i = 0; i < 8; i++)
+  for (i = 0; i < 8; i++) {
     tbox[i] = _Matrix * box[i];
+  }
 
   Vec3r newMin(tbox[0]);
   Vec3r newMax(tbox[0]);
   for (i = 0; i < 8; i++) {
     for (unsigned int j = 0; j < 3; j++) {
-      if (newMin[j] > tbox[i][j])
+      if (newMin[j] > tbox[i][j]) {
         newMin[j] = tbox[i][j];
-      if (newMax[j] < tbox[i][j])
+      }
+      if (newMax[j] < tbox[i][j]) {
         newMax[j] = tbox[i][j];
+      }
     }
   }
 
@@ -159,8 +166,9 @@ bool NodeTransform::isScaled(const Matrix44r &M)
     for (unsigned int i = 0; i < 3; i++) {
       norm += M(i, j) * M(i, j);
     }
-    if ((norm > 1.01) || (norm < 0.99))
+    if ((norm > 1.01) || (norm < 0.99)) {
       return true;
+    }
   }
 
   return false;
diff --git a/source/blender/freestyle/intern/scene_graph/OrientedLineRep.cpp b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.cpp
index 60730528f1a..9e83527acad 100644
--- a/source/blender/freestyle/intern/scene_graph/OrientedLineRep.cpp
+++ b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.cpp
@@ -28,10 +28,12 @@ namespace Freestyle {
 void OrientedLineRep::accept(SceneVisitor &v)
 {
   Rep::accept(v);
-  if (!frs_material())
+  if (!frs_material()) {
     v.visitOrientedLineRep(*this);
-  else
+  }
+  else {
     v.visitLineRep(*this);
+  }
 }
 
 } /* namespace Freestyle */
diff --git a/source/blender/freestyle/intern/scene_graph/Rep.h b/source/blender/freestyle/intern/scene_graph/Rep.h
index 22078422af6..58553d257d9 100644
--- a/source/blender/freestyle/intern/scene_graph/Rep.h
+++ b/source/blender/freestyle/intern/scene_graph/Rep.h
@@ -54,10 +54,12 @@ class Rep : public BaseObject {
     _Id = iBrother._Id;
     _Name = iBrother._Name;
     _LibraryPath = iBrother._LibraryPath;
-    if (0 == iBrother._FrsMaterial)
+    if (0 == iBrother._FrsMaterial) {
       _FrsMaterial = 0;
-    else
+    }
+    else {
       _FrsMaterial = new FrsMaterial(*(iBrother._FrsMaterial));
+    }
 
     _BBox = iBrother.bbox();
   }
@@ -106,8 +108,9 @@ class Rep : public BaseObject {
    */
   virtual void accept(SceneVisitor &v)
   {
-    if (_FrsMaterial)
+    if (_FrsMaterial) {
       v.visitFrsMaterial(*_FrsMaterial);
+    }
     v.visitRep(*this);
   }
 
diff --git a/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.h b/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.h
index 989e9e36faa..f19233bba3b 100644
--- a/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.h
+++ b/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.h
@@ -36,17 +36,20 @@ class ScenePrettyPrinter : public SceneVisitor {
  public:
   ScenePrettyPrinter(const string filename = "SceneLog.txt") : SceneVisitor()
   {
-    if (!filename.empty())
+    if (!filename.empty()) {
       _ofs.open(filename.c_str());
-    if (!_ofs.is_open())
+    }
+    if (!_ofs.is_open()) {
       cerr << "Warning, unable to open file \"" << filename << "\"" << endl;
+    }
     _space = "";
   }
 
   virtual ~ScenePrettyPrinter()
   {
-    if (_ofs.is_open())
+    if (_ofs.is_open()) {
       _ofs.close();
+    }
   }
 
   //
diff --git a/source/blender/freestyle/intern/scene_graph/TriangleRep.cpp b/source/blender/freestyle/intern/scene_graph/TriangleRep.cpp
index ab8ee9e9bb6..8e90ec4fb86 100644
--- a/source/blender/freestyle/intern/scene_graph/TriangleRep.cpp
+++ b/source/blender/freestyle/intern/scene_graph/TriangleRep.cpp
@@ -36,22 +36,28 @@ void TriangleRep::ComputeBBox()
   // parse all the coordinates to find the XMax, YMax, ZMax
   for (int i = 0; i < 3; ++i) {
     // X
-    if (_vertices[i][0] > XMax)
+    if (_vertices[i][0] > XMax) {
       XMax = _vertices[i][0];
-    if (_vertices[i][0] < XMin)
+    }
+    if (_vertices[i][0] < XMin) {
       XMin = _vertices[i][0];
+    }
 
     // Y
-    if (_vertices[i][1] > YMax)
+    if (_vertices[i][1] > YMax) {
       YMax = _vertices[i][1];
-    if (_vertices[i][1] < YMin)
+    }
+    if (_vertices[i][1] < YMin) {
       YMin = _vertices[i][1];
+    }
 
     // Z
-    if (_vertices[i][2] > ZMax)
+    if (_vertices[i][2] > ZMax) {
       ZMax = _vertices[i][2];
-    if (_vertices[i][2] < ZMin)
+    }
+    if (_vertices[i][2] < ZMin) {
       ZMin = _vertices[i][2];
+    }
   }
 
   setBBox(BBox<Vec3r>(Vec3r(XMin, YMin, ZMin), Vec3r(XMax, YMax, ZMax)));