Cleanup: Freestyle, Clang-Tidy else-after-return fixes

This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/freestyle` module.

No functional changes.

17 files changed, 108 insertions, 132 deletions

diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp
index f9edadb2d4a..dea09b7620f 100644
--- a/source/blender/freestyle/intern/application/Controller.cpp
+++ b/source/blender/freestyle/intern/application/Controller.cpp
@@ -316,10 +316,9 @@ int Controller::LoadMesh(Render *re, ViewLayer *view_layer, Depsgraph *depsgraph
       ClearRootNode();
       return 0;
     }
-    else {
-      delete _ViewMap;
-      _ViewMap = NULL;
-    }
+
+    delete _ViewMap;
+    _ViewMap = NULL;
   }
 
   _Chrono.start();
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index e1763514e08..a06218620ac 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -684,7 +684,7 @@ void BlenderFileLoader::insertShapeNode(Object *ob, Mesh *me, int id)
     if (v0 == v1 || v0 == v2 || v1 == v2) {
       continue;  // do nothing for now
     }
-    else if (GeomUtils::distPointSegment<Vec3r>(v0, v1, v2) < 1.0e-6) {
+    if (GeomUtils::distPointSegment<Vec3r>(v0, v1, v2) < 1.0e-6) {
       detri.viP = vi0;
       detri.viA = vi1;
       detri.viB = vi2;
diff --git a/source/blender/freestyle/intern/geometry/GeomUtils.cpp b/source/blender/freestyle/intern/geometry/GeomUtils.cpp
index 4c4f12faaba..dbd792852ad 100644
--- a/source/blender/freestyle/intern/geometry/GeomUtils.cpp
+++ b/source/blender/freestyle/intern/geometry/GeomUtils.cpp
@@ -514,9 +514,8 @@ intersection_test intersectRayPlane(const Vec3r &orig,
     if (fabs((norm * orig) + d) <= epsilon) {
       return COINCIDENT;  // plane and ray are coincident
     }
-    else {
-      return COLINEAR;
-    }
+
+    return COLINEAR;
   }
 
   t = -(d + (norm * orig)) / denom;
@@ -766,9 +765,8 @@ inline bool intersect2dSegPoly(Vec2r *seg, Vec2r *poly, unsigned n)
       if (N < 0) {
         return false;
       }
-      else {
-        continue;
-      }
+
+      continue;
     }
 
     t = N / D;
diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp
index 427e4198e5c..03f9760344b 100644
--- a/source/blender/freestyle/intern/python/BPy_Convert.cpp
+++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp
@@ -110,22 +110,22 @@ PyObject *Any_BPy_Interface0D_from_Interface0D(Interface0D &if0D)
   if (typeid(if0D) == typeid(CurvePoint)) {
     return BPy_CurvePoint_from_CurvePoint(dynamic_cast<CurvePoint &>(if0D));
   }
-  else if (typeid(if0D) == typeid(StrokeVertex)) {
+  if (typeid(if0D) == typeid(StrokeVertex)) {
     return BPy_StrokeVertex_from_StrokeVertex(dynamic_cast<StrokeVertex &>(if0D));
   }
-  else if (typeid(if0D) == typeid(SVertex)) {
+  if (typeid(if0D) == typeid(SVertex)) {
     return BPy_SVertex_from_SVertex(dynamic_cast<SVertex &>(if0D));
   }
-  else if (typeid(if0D) == typeid(ViewVertex)) {
+  if (typeid(if0D) == typeid(ViewVertex)) {
     return BPy_ViewVertex_from_ViewVertex(dynamic_cast<ViewVertex &>(if0D));
   }
-  else if (typeid(if0D) == typeid(NonTVertex)) {
+  if (typeid(if0D) == typeid(NonTVertex)) {
     return BPy_NonTVertex_from_NonTVertex(dynamic_cast<NonTVertex &>(if0D));
   }
-  else if (typeid(if0D) == typeid(TVertex)) {
+  if (typeid(if0D) == typeid(TVertex)) {
     return BPy_TVertex_from_TVertex(dynamic_cast<TVertex &>(if0D));
   }
-  else if (typeid(if0D) == typeid(Interface0D)) {
+  if (typeid(if0D) == typeid(Interface0D)) {
     return BPy_Interface0D_from_Interface0D(if0D);
   }
   string msg("unexpected type: " + if0D.getExactTypeName());
@@ -138,22 +138,22 @@ PyObject *Any_BPy_Interface1D_from_Interface1D(Interface1D &if1D)
   if (typeid(if1D) == typeid(ViewEdge)) {
     return BPy_ViewEdge_from_ViewEdge(dynamic_cast<ViewEdge &>(if1D));
   }
-  else if (typeid(if1D) == typeid(Chain)) {
+  if (typeid(if1D) == typeid(Chain)) {
     return BPy_Chain_from_Chain(dynamic_cast<Chain &>(if1D));
   }
-  else if (typeid(if1D) == typeid(Stroke)) {
+  if (typeid(if1D) == typeid(Stroke)) {
     return BPy_Stroke_from_Stroke(dynamic_cast<Stroke &>(if1D));
   }
-  else if (typeid(if1D) == typeid(FEdgeSharp)) {
+  if (typeid(if1D) == typeid(FEdgeSharp)) {
     return BPy_FEdgeSharp_from_FEdgeSharp(dynamic_cast<FEdgeSharp &>(if1D));
   }
-  else if (typeid(if1D) == typeid(FEdgeSmooth)) {
+  if (typeid(if1D) == typeid(FEdgeSmooth)) {
     return BPy_FEdgeSmooth_from_FEdgeSmooth(dynamic_cast<FEdgeSmooth &>(if1D));
   }
-  else if (typeid(if1D) == typeid(FEdge)) {
+  if (typeid(if1D) == typeid(FEdge)) {
     return BPy_FEdge_from_FEdge(dynamic_cast<FEdge &>(if1D));
   }
-  else if (typeid(if1D) == typeid(Interface1D)) {
+  if (typeid(if1D) == typeid(Interface1D)) {
     return BPy_Interface1D_from_Interface1D(if1D);
   }
   string msg("unexpected type: " + if1D.getExactTypeName());
@@ -166,10 +166,10 @@ PyObject *Any_BPy_FEdge_from_FEdge(FEdge &fe)
   if (typeid(fe) == typeid(FEdgeSharp)) {
     return BPy_FEdgeSharp_from_FEdgeSharp(dynamic_cast<FEdgeSharp &>(fe));
   }
-  else if (typeid(fe) == typeid(FEdgeSmooth)) {
+  if (typeid(fe) == typeid(FEdgeSmooth)) {
     return BPy_FEdgeSmooth_from_FEdgeSmooth(dynamic_cast<FEdgeSmooth &>(fe));
   }
-  else if (typeid(fe) == typeid(FEdge)) {
+  if (typeid(fe) == typeid(FEdge)) {
     return BPy_FEdge_from_FEdge(fe);
   }
   string msg("unexpected type: " + fe.getExactTypeName());
@@ -182,10 +182,10 @@ PyObject *Any_BPy_ViewVertex_from_ViewVertex(ViewVertex &vv)
   if (typeid(vv) == typeid(NonTVertex)) {
     return BPy_NonTVertex_from_NonTVertex(dynamic_cast<NonTVertex &>(vv));
   }
-  else if (typeid(vv) == typeid(TVertex)) {
+  if (typeid(vv) == typeid(TVertex)) {
     return BPy_TVertex_from_TVertex(dynamic_cast<TVertex &>(vv));
   }
-  else if (typeid(vv) == typeid(ViewVertex)) {
+  if (typeid(vv) == typeid(ViewVertex)) {
     return BPy_ViewVertex_from_ViewVertex(vv);
   }
   string msg("unexpected type: " + vv.getExactTypeName());
@@ -773,7 +773,7 @@ bool float_array_from_PyObject(PyObject *obj, float *v, int n)
     }
     return 1;
   }
-  else if (ColorObject_Check(obj) && n == 3) {
+  if (ColorObject_Check(obj) && n == 3) {
     if (BaseMath_ReadCallback((BaseMathObject *)obj) == -1) {
       return 0;
     }
@@ -782,10 +782,10 @@ bool float_array_from_PyObject(PyObject *obj, float *v, int n)
     }
     return 1;
   }
-  else if (PyList_Check(obj) && PyList_GET_SIZE(obj) == n) {
+  if (PyList_Check(obj) && PyList_GET_SIZE(obj) == n) {
     return float_array_from_PyList(obj, v, n);
   }
-  else if (PyTuple_Check(obj) && PyTuple_GET_SIZE(obj) == n) {
+  if (PyTuple_Check(obj) && PyTuple_GET_SIZE(obj) == n) {
     return float_array_from_PyTuple(obj, v, n);
   }
   return 0;
diff --git a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
index 3c2f022adb6..dbf1c12fb01 100644
--- a/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
+++ b/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
@@ -508,9 +508,8 @@ static PyObject *BPy_FrsMaterial_richcmpr(PyObject *objectA,
     if (comparison_type == Py_NE) {
       Py_RETURN_TRUE;
     }
-    else {
-      Py_RETURN_FALSE;
-    }
+
+    Py_RETURN_FALSE;
   }
 
   matA = (BPy_FrsMaterial *)objectA;
@@ -531,9 +530,8 @@ static PyObject *BPy_FrsMaterial_richcmpr(PyObject *objectA,
   if (result == true) {
     Py_RETURN_TRUE;
   }
-  else {
-    Py_RETURN_FALSE;
-  }
+
+  Py_RETURN_FALSE;
 }
 
 static Py_hash_t FrsMaterial_hash(PyObject *self)
diff --git a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
index 98b0099bcad..9c155db913c 100644
--- a/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
+++ b/source/blender/freestyle/intern/python/BPy_IntegrationType.cpp
@@ -88,21 +88,20 @@ static PyObject *Integrator_integrate(PyObject * /*self*/, PyObject *args, PyObj
     double res = integrate(*fun, it, it_end, t);
     return PyFloat_FromDouble(res);
   }
-  else if (BPy_UnaryFunction0DFloat_Check(obj1)) {
+  if (BPy_UnaryFunction0DFloat_Check(obj1)) {
     UnaryFunction0D<float> *fun = ((BPy_UnaryFunction0DFloat *)obj1)->uf0D_float;
     float res = integrate(*fun, it, it_end, t);
     return PyFloat_FromDouble(res);
   }
-  else if (BPy_UnaryFunction0DUnsigned_Check(obj1)) {
+  if (BPy_UnaryFunction0DUnsigned_Check(obj1)) {
     UnaryFunction0D<unsigned int> *fun = ((BPy_UnaryFunction0DUnsigned *)obj1)->uf0D_unsigned;
     unsigned int res = integrate(*fun, it, it_end, t);
     return PyLong_FromLong(res);
   }
-  else {
-    string class_name(Py_TYPE(obj1)->tp_name);
-    PyErr_SetString(PyExc_TypeError, ("unsupported function type: " + class_name).c_str());
-    return NULL;
-  }
+
+  string class_name(Py_TYPE(obj1)->tp_name);
+  PyErr_SetString(PyExc_TypeError, ("unsupported function type: " + class_name).c_str());
+  return NULL;
 }
 
 /*-----------------------Integrator module docstring---------------------------------------*/
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
index f0d6acf461b..734ed0117f4 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
@@ -124,7 +124,7 @@ static PyObject *Interface0DIterator_iternext(BPy_Interface0DIterator *self)
       PyErr_SetNone(PyExc_StopIteration);
       return NULL;
     }
-    else if (self->at_start) {
+    if (self->at_start) {
       self->at_start = false;
     }
     else if (self->if0D_it->atLast()) {
diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
index df03ecba96f..cda4031240b 100644
--- a/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
+++ b/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
@@ -125,7 +125,7 @@ static PyObject *StrokeVertexIterator_iternext(BPy_StrokeVertexIterator *self)
     }
     /* If at the start of the iterator, only return the object
      * and don't increment, to keep for-loops in sync */
-    else if (self->at_start) {
+    if (self->at_start) {
       self->at_start = false;
     }
     /* If sv_it.atLast() is true, the iterator is currently pointing to the final valid element.
diff --git a/source/blender/freestyle/intern/stroke/Curve.cpp b/source/blender/freestyle/intern/stroke/Curve.cpp
index 02a1d32953d..51c40c890a3 100644
--- a/source/blender/freestyle/intern/stroke/Curve.cpp
+++ b/source/blender/freestyle/intern/stroke/Curve.cpp
@@ -216,10 +216,10 @@ FEdge *CurvePoint::getFEdge(Interface0D &inter)
     if (iVertexB->__B == 0) {
       return __A->getFEdge(*(iVertexB->__A));
     }
-    else if (iVertexB->__A == __A) {
+    if (iVertexB->__A == __A) {
       return __A->getFEdge(*(iVertexB->__B));
     }
-    else if (iVertexB->__B == __A) {
+    if (iVertexB->__B == __A) {
       return __A->getFEdge(*(iVertexB->__A));
     }
   }
@@ -227,7 +227,7 @@ FEdge *CurvePoint::getFEdge(Interface0D &inter)
     if (iVertexB->__A == __A) {
       return __B->getFEdge(*(iVertexB->__A));
     }
-    else if (iVertexB->__A == __B) {
+    if (iVertexB->__A == __B) {
       return __A->getFEdge(*(iVertexB->__A));
     }
   }
diff --git a/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp b/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp
index a76579c7c96..a29d015b4c9 100644
--- a/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp
@@ -101,9 +101,8 @@ unsigned TextureManager::getBrushTextureIndex(string name, Stroke::MediumType lo
     cerr << "brush file " << name << " not found" << endl;
     return 0;
   }
-  else {
-    return _brushesMap[bt];
-  }
+
+  return _brushesMap[bt];
 }
 
 void TextureManager::Options::setPatternsPath(const string &path)
diff --git a/source/blender/freestyle/intern/system/PseudoNoise.cpp b/source/blender/freestyle/intern/system/PseudoNoise.cpp
index 048be5d018c..c05c269c404 100644
--- a/source/blender/freestyle/intern/system/PseudoNoise.cpp
+++ b/source/blender/freestyle/intern/system/PseudoNoise.cpp
@@ -33,9 +33,8 @@ static int modf_to_index(Freestyle::real x, unsigned int range)
     BLI_assert(i >= 0 && i < range);
     return i;
   }
-  else {
-    return 0;
-  }
+
+  return 0;
 }
 
 namespace Freestyle {
diff --git a/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp b/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp
index 55bc02b8358..26a40ee587c 100644
--- a/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp
+++ b/source/blender/freestyle/intern/view_map/HeuristicGridDensityProviderFactory.cpp
@@ -43,9 +43,8 @@ AutoPtr<GridDensityProvider> HeuristicGridDensityProviderFactory::newGridDensity
   if (avg->cellSize() > p23->cellSize()) {
     return (AutoPtr<GridDensityProvider>)p23;
   }
-  else {
-    return (AutoPtr<GridDensityProvider>)avg;
-  }
+
+  return (AutoPtr<GridDensityProvider>)avg;
 }
 
 AutoPtr<GridDensityProvider> HeuristicGridDensityProviderFactory::newGridDensityProvider(
@@ -58,9 +57,8 @@ AutoPtr<GridDensityProvider> HeuristicGridDensityProviderFactory::newGridDensity
   if (avg->cellSize() > p23->cellSize()) {
     return (AutoPtr<GridDensityProvider>)p23;
   }
-  else {
-    return (AutoPtr<GridDensityProvider>)avg;
-  }
+
+  return (AutoPtr<GridDensityProvider>)avg;
 }
 
 AutoPtr<GridDensityProvider> HeuristicGridDensityProviderFactory::newGridDensityProvider(
@@ -75,9 +73,8 @@ AutoPtr<GridDensityProvider> HeuristicGridDensityProviderFactory::newGridDensity
   if (avg->cellSize() > p23->cellSize()) {
     return (AutoPtr<GridDensityProvider>)p23;
   }
-  else {
-    return (AutoPtr<GridDensityProvider>)avg;
-  }
+
+  return (AutoPtr<GridDensityProvider>)avg;
 }
 
 } /* namespace Freestyle */
diff --git a/source/blender/freestyle/intern/view_map/OccluderSource.cpp b/source/blender/freestyle/intern/view_map/OccluderSource.cpp
index 7132e0172ae..e75856edc35 100644
--- a/source/blender/freestyle/intern/view_map/OccluderSource.cpp
+++ b/source/blender/freestyle/intern/view_map/OccluderSource.cpp
@@ -77,11 +77,10 @@ bool OccluderSource::next()
         valid = false;
         return false;
       }
-      else {
-        vector<WFace *> &wFaces = (*currentShape)->GetFaceList();
-        currentFace = wFaces.begin();
-        facesEnd = wFaces.end();
-      }
+
+      vector<WFace *> &wFaces = (*currentShape)->GetFaceList();
+      currentFace = wFaces.begin();
+      facesEnd = wFaces.end();
     }
     buildCachedPolygon();
     return true;
diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
index d024c360e3f..aecd37fa0de 100644
--- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
@@ -344,9 +344,8 @@ OWXFaceLayer ViewEdgeXBuilder::FindNextFaceLayer(const OWXFaceLayer &iFaceLayer)
           if (woeend == winner->getSmoothEdge()->woea()->twin()) {
             return OWXFaceLayer(winner, true);
           }
-          else {
-            return OWXFaceLayer(winner, false);
-          }
+
+          return OWXFaceLayer(winner, false);
         }
       }
       ++f;
@@ -368,19 +367,17 @@ OWXFaceLayer ViewEdgeXBuilder::FindNextFaceLayer(const OWXFaceLayer &iFaceLayer)
     if ((sameNatureLayers.empty()) || (sameNatureLayers.size() != 1)) {
       return OWXFaceLayer(NULL, true);
     }
-    else {
-      WXFaceLayer *winner = sameNatureLayers[0];
-      // check face mark continuity
-      if (winner->getFace()->GetMark() != iFaceLayer.fl->getFace()->GetMark()) {
-        return OWXFaceLayer(NULL, true);
-      }
-      if (woeend == winner->getSmoothEdge()->woea()->twin()) {
-        return OWXFaceLayer(winner, true);
-      }
-      else {
-        return OWXFaceLayer(winner, false);
-      }
+
+    WXFaceLayer *winner = sameNatureLayers[0];
+    // check face mark continuity
+    if (winner->getFace()->GetMark() != iFaceLayer.fl->getFace()->GetMark()) {
+      return OWXFaceLayer(NULL, true);
+    }
+    if (woeend == winner->getSmoothEdge()->woea()->twin()) {
+      return OWXFaceLayer(winner, true);
     }
+
+    return OWXFaceLayer(winner, false);
   }
   return OWXFaceLayer(NULL, true);
 }
@@ -429,9 +426,8 @@ OWXFaceLayer ViewEdgeXBuilder::FindPreviousFaceLayer(const OWXFaceLayer &iFaceLa
           if (woebegin == winner->getSmoothEdge()->woeb()->twin()) {
             return OWXFaceLayer(winner, true);
           }
-          else {
-            return OWXFaceLayer(winner, false);
-          }
+
+          return OWXFaceLayer(winner, false);
         }
       }
     }
@@ -452,19 +448,17 @@ OWXFaceLayer ViewEdgeXBuilder::FindPreviousFaceLayer(const OWXFaceLayer &iFaceLa
     if ((sameNatureLayers.empty()) || (sameNatureLayers.size() != 1)) {
       return OWXFaceLayer(NULL, true);
     }
-    else {
-      WXFaceLayer *winner = sameNatureLayers[0];
-      // check face mark continuity
-      if (winner->getFace()->GetMark() != iFaceLayer.fl->getFace()->GetMark()) {
-        return OWXFaceLayer(NULL, true);
-      }
-      if (woebegin == winner->getSmoothEdge()->woeb()->twin()) {
-        return OWXFaceLayer(winner, true);
-      }
-      else {
-        return OWXFaceLayer(winner, false);
-      }
+
+    WXFaceLayer *winner = sameNatureLayers[0];
+    // check face mark continuity
+    if (winner->getFace()->GetMark() != iFaceLayer.fl->getFace()->GetMark()) {
+      return OWXFaceLayer(NULL, true);
+    }
+    if (woebegin == winner->getSmoothEdge()->woeb()->twin()) {
+      return OWXFaceLayer(winner, true);
     }
+
+    return OWXFaceLayer(winner, false);
   }
   return OWXFaceLayer(NULL, true);
 }
@@ -631,11 +625,10 @@ OWXEdge ViewEdgeXBuilder::FindNextWEdge(const OWXEdge &iEdge)
       // So the vertex order is OK.
       return OWXEdge(wxe, true);
     }
-    else {
-      // That means that the face necessarily lies on the edge left.
-      // So the vertex order is OK.
-      return OWXEdge(wxe, false);
-    }
+
+    // That means that the face necessarily lies on the edge left.
+    // So the vertex order is OK.
+    return OWXEdge(wxe, false);
   }
   // we did not find:
   return OWXEdge(NULL, true);
@@ -679,9 +672,8 @@ OWXEdge ViewEdgeXBuilder::FindPreviousWEdge(const OWXEdge &iEdge)
     if (wxe->GetbVertex() == v) {
       return OWXEdge(wxe, true);
     }
-    else {
-      return OWXEdge(wxe, false);
-    }
+
+    return OWXEdge(wxe, false);
   }
   // we did not find:
   return OWXEdge(NULL, true);
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.cpp b/source/blender/freestyle/intern/view_map/ViewMap.cpp
index 47c6c3a1f6a..fa2f95dac72 100644
--- a/source/blender/freestyle/intern/view_map/ViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMap.cpp
@@ -323,18 +323,16 @@ static bool ViewEdgeComp(ViewVertex::directedViewEdge &dve1, ViewVertex::directe
     if (v2.y() < 0) {
       return true;
     }
-    else {
-      return (v1.x() > v2.x());
-    }
+
+    return (v1.x() > v2.x());
   }
-  else {
-    if (v2.y() > 0) {
-      return false;
-    }
-    else {
-      return (v1.x() < v2.x());
-    }
+
+  if (v2.y() > 0) {
+    return false;
   }
+
+  return (v1.x() < v2.x());
+
   return false;
 }
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
index 8ac272e92b5..a0989c52e4e 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
@@ -504,10 +504,10 @@ static void computeCumulativeVisibility(ViewMap *ioViewMap,
       (*ve)->setaShape(0);
       continue;
     }
-    else {
-      ++qiMajority;
-      qiMajority >>= 1;
-    }
+
+    ++qiMajority;
+    qiMajority >>= 1;
+
 #if LOGGING
     if (_global.debug & G_DEBUG_FREESTYLE) {
       cout << "\tqiMajority: " << qiMajority << endl;
@@ -702,10 +702,10 @@ static void computeDetailedVisibility(ViewMap *ioViewMap,
       (*ve)->setaShape(0);
       continue;
     }
-    else {
-      ++qiMajority;
-      qiMajority >>= 1;
-    }
+
+    ++qiMajority;
+    qiMajority >>= 1;
+
 #if LOGGING
     if (_global.debug & G_DEBUG_FREESTYLE) {
       cout << "\tqiMajority: " << qiMajority << endl;
@@ -873,10 +873,9 @@ static void computeFastVisibility(ViewMap *ioViewMap, G &grid, real epsilon)
       (*ve)->setaShape(0);
       continue;
     }
-    else {
-      ++qiMajority;
-      qiMajority >>= 1;
-    }
+
+    ++qiMajority;
+    qiMajority >>= 1;
 
     even_test = true;
     maxIndex = 0;
diff --git a/source/blender/freestyle/intern/winged_edge/WEdge.cpp b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
index d624728250a..c8805c144e3 100644
--- a/source/blender/freestyle/intern/winged_edge/WEdge.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
@@ -114,7 +114,7 @@ bool WVertex::isBoundary()
   if (_Border == 1) {
     return true;
   }
-  else if (_Border == 0) {
+  if (_Border == 0) {
     return false;
   }
 
@@ -412,9 +412,8 @@ bool WFace::getOppositeEdge(const WVertex *v, WOEdge *&e)
   if (!e) {
     return false;
   }
-  else {
-    return true;
-  }
+
+  return true;
 }
 
 float WFace::getArea()