Cleanup: Clang-Tidy modernize-use-nullptr

Replace `NULL` with `nullptr` in C++ code.

No functional changes.

15 files changed, 168 insertions, 168 deletions

diff --git a/source/blender/freestyle/intern/view_map/BoxGrid.cpp b/source/blender/freestyle/intern/view_map/BoxGrid.cpp
index aea54afc0f5..e81291c94bc 100644
--- a/source/blender/freestyle/intern/view_map/BoxGrid.cpp
+++ b/source/blender/freestyle/intern/view_map/BoxGrid.cpp
@@ -157,7 +157,7 @@ void BoxGrid::assignCells(OccluderSource & /*source*/,
       Vec3r point = transform((*f)->center3d());
       unsigned int i, j;
       getCellCoordinates(point, i, j);
-      if (_cells[i * _cellsY + j] == NULL) {
+      if (_cells[i * _cellsY + j] == nullptr) {
         // This is an uninitialized cell
         real x, y, width, height;
 
@@ -181,7 +181,7 @@ void BoxGrid::distributePolygons(OccluderSource &source)
   unsigned long nKeptFaces = 0;
 
   for (source.begin(); source.isValid(); source.next()) {
-    OccluderData *occluder = NULL;
+    OccluderData *occluder = nullptr;
 
     try {
       if (insertOccluder(source, occluder)) {
diff --git a/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp b/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp
index b53771ad2c2..a6781bfc8d1 100644
--- a/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp
+++ b/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp
@@ -146,7 +146,7 @@ void CulledOccluderSource::cullViewEdges(ViewMap &viewMap, bool extensiveFEdgeSe
 
     // For each feature edge, while bestOccluderTarget not found and view edge not visible
     bool bestOccluderTargetFound = false;
-    FEdge *bestOccluderTarget = NULL;
+    FEdge *bestOccluderTarget = nullptr;
     real bestOccluderDistance = 0.0;
     FEdge *festart = (*ve)->fedgeA();
     FEdge *fe = festart;
@@ -173,7 +173,7 @@ void CulledOccluderSource::cullViewEdges(ViewMap &viewMap, bool extensiveFEdgeSe
         else {
           real d = distance2D(fe->center2d(), prosceniumOrigin);
           // If center point is closer to viewport origin than current target
-          if (bestOccluderTarget == NULL || d < bestOccluderDistance) {
+          if (bestOccluderTarget == nullptr || d < bestOccluderDistance) {
             // Then store as bestOccluderTarget
             bestOccluderDistance = d;
             bestOccluderTarget = fe;
@@ -187,7 +187,7 @@ void CulledOccluderSource::cullViewEdges(ViewMap &viewMap, bool extensiveFEdgeSe
         (*ve)->setIsInImage(true);
       }
       fe = fe->nextEdge();
-    } while (fe != NULL && fe != festart && !(bestOccluderTargetFound && (*ve)->isInImage()));
+    } while (fe != nullptr && fe != festart && !(bestOccluderTargetFound && (*ve)->isInImage()));
 
     // Either we have run out of FEdges, or we already have the one edge we need to determine
     // visibility Cull all remaining edges.
@@ -198,7 +198,7 @@ void CulledOccluderSource::cullViewEdges(ViewMap &viewMap, bool extensiveFEdgeSe
 
     // If bestOccluderTarget was not found inside the occluder proscenium,
     // we need to expand the occluder proscenium to include it.
-    if ((*ve)->isInImage() && bestOccluderTarget != NULL && !bestOccluderTargetFound) {
+    if ((*ve)->isInImage() && bestOccluderTarget != nullptr && !bestOccluderTargetFound) {
       // Expand occluder proscenium to enclose bestOccluderTarget
       Vec3r point = bestOccluderTarget->center2d();
       if (point[0] < occluderProscenium[0]) {
diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
index 3788b5e3545..7e8937bfe80 100644
--- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
+++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
@@ -39,7 +39,7 @@ void FEdgeXDetector::processShapes(WingedEdge &we)
   vector<WShape *> wshapes = we.getWShapes();
   WXShape *wxs;
 
-  if (_pProgressBar != NULL) {
+  if (_pProgressBar != nullptr) {
     _pProgressBar->reset();
     _pProgressBar->setLabelText("Detecting feature lines");
     _pProgressBar->setTotalSteps(wshapes.size() * 3);
@@ -228,7 +228,7 @@ void FEdgeXDetector::computeCurvatures(WXVertex *vertex)
   }
   // view dependent
   C = vertex->curvatures();
-  if (C == 0) {
+  if (C == nullptr) {
     return;
   }
 
@@ -370,7 +370,7 @@ void FEdgeXDetector::ProcessBorderEdge(WXEdge *iEdge)
 {
   // first check whether it is a border edge: BORDER ?
   //---------
-  if (iEdge->GetaFace() == 0) {
+  if (iEdge->GetaFace() == nullptr) {
     // it is a border edge
     iEdge->AddNature(Nature::BORDER);
   }
diff --git a/source/blender/freestyle/intern/view_map/Functions0D.cpp b/source/blender/freestyle/intern/view_map/Functions0D.cpp
index 892b9b33b4b..5a9e1207784 100644
--- a/source/blender/freestyle/intern/view_map/Functions0D.cpp
+++ b/source/blender/freestyle/intern/view_map/Functions0D.cpp
@@ -47,7 +47,7 @@ void getFEdges(Interface0DIterator &it, FEdge *&fe1, FEdge *&fe2)
   }
   if (count < 3) {
     // if we only have 2 vertices
-    FEdge *fe = 0;
+    FEdge *fe = nullptr;
     Interface0DIterator tmp = it;
     if (it.isBegin()) {
       ++tmp;
@@ -58,7 +58,7 @@ void getFEdges(Interface0DIterator &it, FEdge *&fe1, FEdge *&fe2)
       fe = it->getFEdge(*tmp);
     }
     fe1 = fe;
-    fe2 = NULL;
+    fe2 = nullptr;
   }
   else {
     // we have more than 2 vertices
@@ -77,11 +77,11 @@ void getFEdges(Interface0DIterator &it, FEdge *&fe1, FEdge *&fe2)
     }
     if (begin) {
       fe1 = it->getFEdge(*next);
-      fe2 = NULL;
+      fe2 = nullptr;
     }
     else if (last) {
       fe1 = previous->getFEdge(*it);
-      fe2 = NULL;
+      fe2 = nullptr;
     }
     else {
       fe1 = previous->getFEdge(*it);
@@ -95,14 +95,14 @@ void getViewEdges(Interface0DIterator &it, ViewEdge *&ve1, ViewEdge *&ve2)
   FEdge *fe1, *fe2;
   getFEdges(it, fe1, fe2);
   ve1 = fe1->viewedge();
-  if (fe2 != NULL) {
+  if (fe2 != nullptr) {
     ve2 = fe2->viewedge();
     if (ve2 == ve1) {
-      ve2 = NULL;
+      ve2 = nullptr;
     }
   }
   else {
-    ve2 = NULL;
+    ve2 = nullptr;
   }
 }
 
@@ -124,7 +124,7 @@ void getOccludersF0D(Interface0DIterator &it, set<ViewShape *> &oOccluders)
     oOccluders.insert((*oit));
   }
 
-  if (ve2 != NULL) {
+  if (ve2 != nullptr) {
     oit = ve2->occluders_begin();
     oitend = ve2->occluders_end();
     for (; oit != oitend; ++oit) {
@@ -280,7 +280,7 @@ int ZDiscontinuityF0D::operator()(Interface0DIterator &iter)
   FEdge *fe1, *fe2;
   getFEdges(iter, fe1, fe2);
   result = fe1->z_discontinuity();
-  if (fe2 != NULL) {
+  if (fe2 != nullptr) {
     result += fe2->z_discontinuity();
     result /= 2.0f;
   }
@@ -294,7 +294,7 @@ int Normal2DF0D::operator()(Interface0DIterator &iter)
   Vec3f e1(fe1->orientation2d());
   Vec2f n1(e1[1], -e1[0]);
   Vec2f n(n1);
-  if (fe2 != NULL) {
+  if (fe2 != nullptr) {
     Vec3f e2(fe2->orientation2d());
     Vec2f n2(e2[1], -e2[0]);
     n += n2;
@@ -308,7 +308,7 @@ int MaterialF0D::operator()(Interface0DIterator &iter)
 {
   FEdge *fe1, *fe2;
   getFEdges(iter, fe1, fe2);
-  if (fe1 == NULL) {
+  if (fe1 == nullptr) {
     return -1;
   }
   if (fe1->isSmooth()) {
@@ -337,7 +337,7 @@ int QuantitativeInvisibilityF0D::operator()(Interface0DIterator &iter)
   getViewEdges(iter, ve1, ve2);
   unsigned int qi1, qi2;
   qi1 = ve1->qi();
-  if (ve2 != NULL) {
+  if (ve2 != nullptr) {
     qi2 = ve2->qi();
     if (qi2 != qi1) {
       if (G.debug & G_DEBUG_FREESTYLE) {
@@ -356,7 +356,7 @@ int CurveNatureF0D::operator()(Interface0DIterator &iter)
   ViewEdge *ve1, *ve2;
   getViewEdges(iter, ve1, ve2);
   nat |= ve1->getNature();
-  if (ve2 != NULL) {
+  if (ve2 != nullptr) {
     nat |= ve2->getNature();
   }
   result = nat;
diff --git a/source/blender/freestyle/intern/view_map/Functions1D.cpp b/source/blender/freestyle/intern/view_map/Functions1D.cpp
index a0a320a6e6d..6194e7b4eed 100644
--- a/source/blender/freestyle/intern/view_map/Functions1D.cpp
+++ b/source/blender/freestyle/intern/view_map/Functions1D.cpp
@@ -219,8 +219,8 @@ void getOccludeeF1D(Interface1D &inter, set<ViewShape *> &oShapes)
   ViewEdge *ve = dynamic_cast<ViewEdge *>(&inter);
   if (ve) {
     ViewShape *aShape = ve->aShape();
-    if (aShape == 0) {
-      oShapes.insert((ViewShape *)0);
+    if (aShape == nullptr) {
+      oShapes.insert((ViewShape *)nullptr);
       return;
     }
     oShapes.insert(aShape);
diff --git a/source/blender/freestyle/intern/view_map/Interface0D.cpp b/source/blender/freestyle/intern/view_map/Interface0D.cpp
index 2961b0f58e5..907b21ad5cf 100644
--- a/source/blender/freestyle/intern/view_map/Interface0D.cpp
+++ b/source/blender/freestyle/intern/view_map/Interface0D.cpp
@@ -79,7 +79,7 @@ Geometry::Vec2r Interface0D::getPoint2D() const
 FEdge *Interface0D::getFEdge(Interface0D &UNUSED(element))
 {
   PyErr_SetString(PyExc_TypeError, "method getFEdge() not properly overridden");
-  return 0;
+  return nullptr;
 }
 
 Id Interface0D::getId() const
@@ -97,25 +97,25 @@ Nature::VertexNature Interface0D::getNature() const
 SVertex *Interface0D::castToSVertex()
 {
   PyErr_SetString(PyExc_TypeError, "method castToSVertex() not properly overridden");
-  return 0;
+  return nullptr;
 }
 
 ViewVertex *Interface0D::castToViewVertex()
 {
   PyErr_SetString(PyExc_TypeError, "method castToViewVertex() not properly overridden");
-  return 0;
+  return nullptr;
 }
 
 NonTVertex *Interface0D::castToNonTVertex()
 {
   PyErr_SetString(PyExc_TypeError, "method castToNonTVertex() not properly overridden");
-  return 0;
+  return nullptr;
 }
 
 TVertex *Interface0D::castToTVertex()
 {
   PyErr_SetString(PyExc_TypeError, "method castToTVertex() not properly overridden");
-  return 0;
+  return nullptr;
 }
 
 } /* namespace Freestyle */
diff --git a/source/blender/freestyle/intern/view_map/Silhouette.cpp b/source/blender/freestyle/intern/view_map/Silhouette.cpp
index 3280e56ea7e..0f9d1f166b2 100644
--- a/source/blender/freestyle/intern/view_map/Silhouette.cpp
+++ b/source/blender/freestyle/intern/view_map/Silhouette.cpp
@@ -158,14 +158,14 @@ real SVertex::z_discontinuity() const
 FEdge *SVertex::fedge()
 {
   if (getNature() & Nature::T_VERTEX) {
-    return NULL;
+    return nullptr;
   }
   return _FEdges[0];
 }
 
 FEdge *SVertex::getFEdge(Interface0D &inter)
 {
-  FEdge *result = NULL;
+  FEdge *result = nullptr;
   SVertex *iVertexB = dynamic_cast<SVertex *>(&inter);
   if (!iVertexB) {
     return result;
@@ -177,7 +177,7 @@ FEdge *SVertex::getFEdge(Interface0D &inter)
       result = (*fe);
     }
   }
-  if ((result == 0) && (getNature() & Nature::T_VERTEX)) {
+  if ((result == nullptr) && (getNature() & Nature::T_VERTEX)) {
     SVertex *brother;
     ViewVertex *vvertex = viewvertex();
     TVertex *tvertex = dynamic_cast<TVertex *>(vvertex);
@@ -195,7 +195,7 @@ FEdge *SVertex::getFEdge(Interface0D &inter)
       }
     }
   }
-  if ((result == 0) && (iVertexB->getNature() & Nature::T_VERTEX)) {
+  if ((result == nullptr) && (iVertexB->getNature() & Nature::T_VERTEX)) {
     SVertex *brother;
     ViewVertex *vvertex = iVertexB->viewvertex();
     TVertex *tvertex = dynamic_cast<TVertex *>(vvertex);
@@ -239,8 +239,8 @@ float FEdge::viewedge_length() const
 const SShape *FEdge::occluded_shape() const
 {
   ViewShape *aShape = _ViewEdge->aShape();
-  if (aShape == 0) {
-    return 0;
+  if (aShape == nullptr) {
+    return nullptr;
   }
   return aShape->sshape();
 }
diff --git a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
index 2624c70c988..21b0827a660 100644
--- a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
+++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
@@ -73,7 +73,7 @@ real SilhouetteGeomEngine::_znear = 0.0;
 real SilhouetteGeomEngine::_zfar = 100.0;
 bool SilhouetteGeomEngine::_isOrthographicProjection = false;
 
-SilhouetteGeomEngine *SilhouetteGeomEngine::_pInstance = NULL;
+SilhouetteGeomEngine *SilhouetteGeomEngine::_pInstance = nullptr;
 
 void SilhouetteGeomEngine::setTransform(const real iModelViewMatrix[4][4],
                                         const real iProjectionMatrix[4][4],
diff --git a/source/blender/freestyle/intern/view_map/SphericalGrid.cpp b/source/blender/freestyle/intern/view_map/SphericalGrid.cpp
index 1399ac396b0..db567d6b5ef 100644
--- a/source/blender/freestyle/intern/view_map/SphericalGrid.cpp
+++ b/source/blender/freestyle/intern/view_map/SphericalGrid.cpp
@@ -154,7 +154,7 @@ void SphericalGrid::assignCells(OccluderSource & /*source*/,
       Vec3r point = SphericalGrid::Transform::sphericalProjection((*f)->center3d());
       unsigned i, j;
       getCellCoordinates(point, i, j);
-      if (_cells[i * _cellsY + j] == NULL) {
+      if (_cells[i * _cellsY + j] == nullptr) {
         // This is an uninitialized cell
         real x, y, width, height;
 
@@ -178,7 +178,7 @@ void SphericalGrid::distributePolygons(OccluderSource &source)
   unsigned long nKeptFaces = 0;
 
   for (source.begin(); source.isValid(); source.next()) {
-    OccluderData *occluder = NULL;
+    OccluderData *occluder = nullptr;
 
     try {
       if (insertOccluder(source, occluder)) {
diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
index a5b3ce454de..d8a1e597a1d 100644
--- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
@@ -88,7 +88,7 @@ void SteerableViewMap::Clear()
       }
     }
     delete[] _imagesPyramids;
-    _imagesPyramids = 0;
+    _imagesPyramids = nullptr;
   }
   if (!_mapping.empty()) {
     for (map<unsigned int, double *>::iterator m = _mapping.begin(), mend = _mapping.end();
@@ -240,7 +240,7 @@ unsigned int SteerableViewMap::getNumberOfPyramidLevels() const
 void SteerableViewMap::saveSteerableViewMap() const
 {
   for (unsigned int i = 0; i <= _nbOrientations; ++i) {
-    if (_imagesPyramids[i] == 0) {
+    if (_imagesPyramids[i] == nullptr) {
       cerr << "SteerableViewMap warning: orientation " << i
            << " of steerable View Map whas not been computed yet" << endl;
       continue;
diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
index 8866ec2e267..f2e97aad382 100644
--- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
@@ -33,13 +33,13 @@ namespace Freestyle {
 
 void ViewEdgeXBuilder::Init(ViewShape *oVShape)
 {
-  if (NULL == oVShape) {
+  if (nullptr == oVShape) {
     return;
   }
 
   // for design convenience, we store the current SShape.
   _pCurrentSShape = oVShape->sshape();
-  if (0 == _pCurrentSShape) {
+  if (nullptr == _pCurrentSShape) {
     return;
   }
 
@@ -164,7 +164,7 @@ ViewEdge *ViewEdgeXBuilder::BuildSmoothViewEdge(const OWXFaceLayer &iFaceLayer)
 
   if (iFaceLayer.fl->nature() & Nature::RIDGE) {
     if (size < 4) {
-      return 0;
+      return nullptr;
     }
   }
 
@@ -176,9 +176,9 @@ ViewEdge *ViewEdgeXBuilder::BuildSmoothViewEdge(const OWXFaceLayer &iFaceLayer)
   _pCurrentVShape->AddEdge(newVEdge);
 
   // build FEdges
-  FEdge *feprevious = NULL;
-  FEdge *fefirst = NULL;
-  FEdge *fe = NULL;
+  FEdge *feprevious = nullptr;
+  FEdge *fefirst = nullptr;
+  FEdge *fe = nullptr;
   for (list<OWXFaceLayer>::iterator fl = facesChain.begin(), flend = facesChain.end(); fl != flend;
        ++fl) {
     fe = BuildSmoothFEdge(feprevious, (*fl));
@@ -201,8 +201,8 @@ ViewEdge *ViewEdgeXBuilder::BuildSmoothViewEdge(const OWXFaceLayer &iFaceLayer)
   if ((first == end) && (size != 1)) {
     fefirst->setPreviousEdge(fe);
     fe->setNextEdge(fefirst);
-    newVEdge->setA(0);
-    newVEdge->setB(0);
+    newVEdge->setA(nullptr);
+    newVEdge->setB(nullptr);
   }
   else {
     ViewVertex *vva = MakeViewVertex(fefirst->vertexA());
@@ -262,9 +262,9 @@ ViewEdge *ViewEdgeXBuilder::BuildSharpViewEdge(const OWXEdge &iWEdge)
   firstWEdge = edgesChain.front();
 
   // build FEdges
-  FEdge *feprevious = NULL;
-  FEdge *fefirst = NULL;
-  FEdge *fe = NULL;
+  FEdge *feprevious = nullptr;
+  FEdge *fefirst = nullptr;
+  FEdge *fe = nullptr;
   for (list<OWXEdge>::iterator we = edgesChain.begin(), weend = edgesChain.end(); we != weend;
        ++we) {
     fe = BuildSharpFEdge(feprevious, (*we));
@@ -284,8 +284,8 @@ ViewEdge *ViewEdgeXBuilder::BuildSharpViewEdge(const OWXEdge &iWEdge)
   if ((firstWEdge == endWEdge) && (size != 1)) {
     fefirst->setPreviousEdge(fe);
     fe->setNextEdge(fefirst);
-    newVEdge->setA(0);
-    newVEdge->setB(0);
+    newVEdge->setA(nullptr);
+    newVEdge->setB(nullptr);
   }
   else {
     ViewVertex *vva = MakeViewVertex(fefirst->vertexA());
@@ -303,7 +303,7 @@ ViewEdge *ViewEdgeXBuilder::BuildSharpViewEdge(const OWXEdge &iWEdge)
 
 OWXFaceLayer ViewEdgeXBuilder::FindNextFaceLayer(const OWXFaceLayer &iFaceLayer)
 {
-  WXFace *nextFace = NULL;
+  WXFace *nextFace = nullptr;
   WOEdge *woeend;
   real tend;
   if (iFaceLayer.order) {
@@ -324,14 +324,14 @@ OWXFaceLayer ViewEdgeXBuilder::FindNextFaceLayer(const OWXFaceLayer &iFaceLayer)
       nextVertex = woeend->GetbVertex();
     }
     if (nextVertex->isBoundary()) {  // if it's a non-manifold vertex -> ignore
-      return OWXFaceLayer(0, true);
+      return OWXFaceLayer(nullptr, true);
     }
     bool found = false;
     WVertex::face_iterator f = nextVertex->faces_begin();
     WVertex::face_iterator fend = nextVertex->faces_end();
     while ((!found) && (f != fend)) {
       nextFace = dynamic_cast<WXFace *>(*f);
-      if ((0 != nextFace) && (nextFace != iFaceLayer.fl->getFace())) {
+      if ((nullptr != nextFace) && (nextFace != iFaceLayer.fl->getFace())) {
         vector<WXFaceLayer *> sameNatureLayers;
         nextFace->retrieveSmoothEdgesLayers(iFaceLayer.fl->nature(), sameNatureLayers);
         // don't know... Maybe should test whether this face has also a vertex_edge configuration.
@@ -339,7 +339,7 @@ OWXFaceLayer ViewEdgeXBuilder::FindNextFaceLayer(const OWXFaceLayer &iFaceLayer)
           WXFaceLayer *winner = sameNatureLayers[0];
           // check face mark continuity
           if (winner->getFace()->GetMark() != iFaceLayer.fl->getFace()->GetMark()) {
-            return OWXFaceLayer(NULL, true);
+            return OWXFaceLayer(nullptr, true);
           }
           if (woeend == winner->getSmoothEdge()->woea()->twin()) {
             return OWXFaceLayer(winner, true);
@@ -354,24 +354,24 @@ OWXFaceLayer ViewEdgeXBuilder::FindNextFaceLayer(const OWXFaceLayer &iFaceLayer)
   else {
     nextFace = dynamic_cast<WXFace *>(iFaceLayer.fl->getFace()->GetBordingFace(woeend));
     if (!nextFace) {
-      return OWXFaceLayer(NULL, true);
+      return OWXFaceLayer(nullptr, true);
     }
     // if the next face layer has either no smooth edge or no smooth edge of same nature, no next
     // face
     if (!nextFace->hasSmoothEdges()) {
-      return OWXFaceLayer(NULL, true);
+      return OWXFaceLayer(nullptr, true);
     }
     vector<WXFaceLayer *> sameNatureLayers;
     nextFace->retrieveSmoothEdgesLayers(iFaceLayer.fl->nature(), sameNatureLayers);
     // don't know how to deal with several edges of same nature on a single face
     if ((sameNatureLayers.empty()) || (sameNatureLayers.size() != 1)) {
-      return OWXFaceLayer(NULL, true);
+      return OWXFaceLayer(nullptr, true);
     }
 
     WXFaceLayer *winner = sameNatureLayers[0];
     // check face mark continuity
     if (winner->getFace()->GetMark() != iFaceLayer.fl->getFace()->GetMark()) {
-      return OWXFaceLayer(NULL, true);
+      return OWXFaceLayer(nullptr, true);
     }
     if (woeend == winner->getSmoothEdge()->woea()->twin()) {
       return OWXFaceLayer(winner, true);
@@ -379,12 +379,12 @@ OWXFaceLayer ViewEdgeXBuilder::FindNextFaceLayer(const OWXFaceLayer &iFaceLayer)
 
     return OWXFaceLayer(winner, false);
   }
-  return OWXFaceLayer(NULL, true);
+  return OWXFaceLayer(nullptr, true);
 }
 
 OWXFaceLayer ViewEdgeXBuilder::FindPreviousFaceLayer(const OWXFaceLayer &iFaceLayer)
 {
-  WXFace *previousFace = NULL;
+  WXFace *previousFace = nullptr;
   WOEdge *woebegin;
   real tend;
   if (iFaceLayer.order) {
@@ -406,14 +406,14 @@ OWXFaceLayer ViewEdgeXBuilder::FindPreviousFaceLayer(const OWXFaceLayer &iFaceLa
       previousVertex = woebegin->GetbVertex();
     }
     if (previousVertex->isBoundary()) {  // if it's a non-manifold vertex -> ignore
-      return OWXFaceLayer(NULL, true);
+      return OWXFaceLayer(nullptr, true);
     }
     bool found = false;
     WVertex::face_iterator f = previousVertex->faces_begin();
     WVertex::face_iterator fend = previousVertex->faces_end();
     for (; (!found) && (f != fend); ++f) {
       previousFace = dynamic_cast<WXFace *>(*f);
-      if ((0 != previousFace) && (previousFace != iFaceLayer.fl->getFace())) {
+      if ((nullptr != previousFace) && (previousFace != iFaceLayer.fl->getFace())) {
         vector<WXFaceLayer *> sameNatureLayers;
         previousFace->retrieveSmoothEdgesLayers(iFaceLayer.fl->nature(), sameNatureLayers);
         // don't know... Maybe should test whether this face has also a vertex_edge configuration
@@ -421,7 +421,7 @@ OWXFaceLayer ViewEdgeXBuilder::FindPreviousFaceLayer(const OWXFaceLayer &iFaceLa
           WXFaceLayer *winner = sameNatureLayers[0];
           // check face mark continuity
           if (winner->getFace()->GetMark() != iFaceLayer.fl->getFace()->GetMark()) {
-            return OWXFaceLayer(NULL, true);
+            return OWXFaceLayer(nullptr, true);
           }
           if (woebegin == winner->getSmoothEdge()->woeb()->twin()) {
             return OWXFaceLayer(winner, true);
@@ -434,25 +434,25 @@ OWXFaceLayer ViewEdgeXBuilder::FindPreviousFaceLayer(const OWXFaceLayer &iFaceLa
   }
   else {
     previousFace = dynamic_cast<WXFace *>(iFaceLayer.fl->getFace()->GetBordingFace(woebegin));
-    if (0 == previousFace) {
-      return OWXFaceLayer(NULL, true);
+    if (nullptr == previousFace) {
+      return OWXFaceLayer(nullptr, true);
     }
     // if the next face layer has either no smooth edge or no smooth edge of same nature, no next
     // face
     if (!previousFace->hasSmoothEdges()) {
-      return OWXFaceLayer(NULL, true);
+      return OWXFaceLayer(nullptr, true);
     }
     vector<WXFaceLayer *> sameNatureLayers;
     previousFace->retrieveSmoothEdgesLayers(iFaceLayer.fl->nature(), sameNatureLayers);
     // don't know how to deal with several edges of same nature on a single face
     if ((sameNatureLayers.empty()) || (sameNatureLayers.size() != 1)) {
-      return OWXFaceLayer(NULL, true);
+      return OWXFaceLayer(nullptr, true);
     }
 
     WXFaceLayer *winner = sameNatureLayers[0];
     // check face mark continuity
     if (winner->getFace()->GetMark() != iFaceLayer.fl->getFace()->GetMark()) {
-      return OWXFaceLayer(NULL, true);
+      return OWXFaceLayer(nullptr, true);
     }
     if (woebegin == winner->getSmoothEdge()->woeb()->twin()) {
       return OWXFaceLayer(winner, true);
@@ -460,7 +460,7 @@ OWXFaceLayer ViewEdgeXBuilder::FindPreviousFaceLayer(const OWXFaceLayer &iFaceLa
 
     return OWXFaceLayer(winner, false);
   }
-  return OWXFaceLayer(NULL, true);
+  return OWXFaceLayer(nullptr, true);
 }
 
 FEdge *ViewEdgeXBuilder::BuildSmoothFEdge(FEdge *feprevious, const OWXFaceLayer &ifl)
@@ -487,7 +487,7 @@ FEdge *ViewEdgeXBuilder::BuildSmoothFEdge(FEdge *feprevious, const OWXFaceLayer
 
   Vec3r normal;
   // Make the 2 Svertices
-  if (feprevious == 0) {  // that means that we don't have any vertex already built for that face
+  if (feprevious == nullptr) {  // that means that we don't have any vertex already built for that face
     Vec3r A1(woea->GetaVertex()->GetVertex());
     Vec3r A2(woea->GetbVertex()->GetVertex());
     Vec3r A(A1 + ta * (A2 - A1));
@@ -543,7 +543,7 @@ FEdge *ViewEdgeXBuilder::BuildSmoothFEdge(FEdge *feprevious, const OWXFaceLayer
   fe->setFrsMaterialIndex(ifl.fl->getFace()->frs_materialIndex());
   fe->setFace(ifl.fl->getFace());
   fe->setFaceMark(ifl.fl->getFace()->GetMark());
-  if (feprevious == 0) {
+  if (feprevious == nullptr) {
     normal.normalize();
   }
   fe->setNormal(normal);
@@ -562,10 +562,10 @@ FEdge *ViewEdgeXBuilder::BuildSmoothFEdge(FEdge *feprevious, const OWXFaceLayer
 
 bool ViewEdgeXBuilder::stopSmoothViewEdge(WXFaceLayer *iFaceLayer)
 {
-  if (NULL == iFaceLayer) {
+  if (nullptr == iFaceLayer) {
     return true;
   }
-  if (iFaceLayer->userdata == 0) {
+  if (iFaceLayer->userdata == nullptr) {
     return false;
   }
   return true;
@@ -588,7 +588,7 @@ int ViewEdgeXBuilder::retrieveFaceMarks(WXEdge *iEdge)
 OWXEdge ViewEdgeXBuilder::FindNextWEdge(const OWXEdge &iEdge)
 {
   if (Nature::NO_FEATURE == iEdge.e->nature()) {
-    return OWXEdge(NULL, true);
+    return OWXEdge(nullptr, true);
   }
 
   WVertex *v;
@@ -600,7 +600,7 @@ OWXEdge ViewEdgeXBuilder::FindNextWEdge(const OWXEdge &iEdge)
   }
 
   if (((WXVertex *)v)->isFeature()) {
-    return 0; /* XXX eeek? NULL? OWXEdge(NULL, true/false)?*/
+    return nullptr; /* XXX eeek? NULL? OWXEdge(NULL, true/false)?*/
   }
 
   int faceMarks = retrieveFaceMarks(iEdge.e);
@@ -631,13 +631,13 @@ OWXEdge ViewEdgeXBuilder::FindNextWEdge(const OWXEdge &iEdge)
     return OWXEdge(wxe, false);
   }
   // we did not find:
-  return OWXEdge(NULL, true);
+  return OWXEdge(nullptr, true);
 }
 
 OWXEdge ViewEdgeXBuilder::FindPreviousWEdge(const OWXEdge &iEdge)
 {
   if (Nature::NO_FEATURE == iEdge.e->nature()) {
-    return OWXEdge(NULL, true);
+    return OWXEdge(nullptr, true);
   }
 
   WVertex *v;
@@ -649,7 +649,7 @@ OWXEdge ViewEdgeXBuilder::FindPreviousWEdge(const OWXEdge &iEdge)
   }
 
   if (((WXVertex *)v)->isFeature()) {
-    return 0;
+    return nullptr;
   }
 
   int faceMarks = retrieveFaceMarks(iEdge.e);
@@ -676,7 +676,7 @@ OWXEdge ViewEdgeXBuilder::FindPreviousWEdge(const OWXEdge &iEdge)
     return OWXEdge(wxe, false);
   }
   // we did not find:
-  return OWXEdge(NULL, true);
+  return OWXEdge(nullptr, true);
 }
 
 FEdge *ViewEdgeXBuilder::BuildSharpFEdge(FEdge *feprevious, const OWXEdge &iwe)
@@ -750,10 +750,10 @@ FEdge *ViewEdgeXBuilder::BuildSharpFEdge(FEdge *feprevious, const OWXEdge &iwe)
 
 bool ViewEdgeXBuilder::stopSharpViewEdge(WXEdge *iEdge)
 {
-  if (NULL == iEdge) {
+  if (nullptr == iEdge) {
     return true;
   }
-  if (iEdge->userdata == 0) {
+  if (iEdge->userdata == nullptr) {
     return false;
   }
   return true;
diff --git a/source/blender/freestyle/intern/view_map/ViewMap.cpp b/source/blender/freestyle/intern/view_map/ViewMap.cpp
index b4faee7946b..60d0e45b9fb 100644
--- a/source/blender/freestyle/intern/view_map/ViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMap.cpp
@@ -37,7 +37,7 @@ namespace Freestyle {
 /*                                */
 /**********************************/
 
-ViewMap *ViewMap::_pInstance = NULL;
+ViewMap *ViewMap::_pInstance = nullptr;
 
 ViewMap::~ViewMap()
 {
@@ -103,7 +103,7 @@ const FEdge *ViewMap::getClosestFEdge(real x, real y) const
 {
   // find the closest of this candidates:
   real minDist = DBL_MAX;
-  FEdge *winner = NULL;
+  FEdge *winner = nullptr;
   for (fedges_container::const_iterator fe = _FEdges.begin(), feend = _FEdges.end(); fe != feend;
        fe++) {
     Vec2d A((*fe)->vertexA()->point2D()[0], (*fe)->vertexA()->point2D()[1]);
@@ -122,7 +122,7 @@ const ViewEdge *ViewMap::getClosestViewEdge(real x, real y) const
 {
   // find the closest of this candidates:
   real minDist = DBL_MAX;
-  FEdge *winner = NULL;
+  FEdge *winner = nullptr;
   for (fedges_container::const_iterator fe = _FEdges.begin(), feend = _FEdges.end(); fe != feend;
        fe++) {
     Vec2d A((*fe)->vertexA()->point2D()[0], (*fe)->vertexA()->point2D()[1]);
@@ -134,7 +134,7 @@ const ViewEdge *ViewMap::getClosestViewEdge(real x, real y) const
     }
   }
   if (!winner) {
-    return NULL;
+    return nullptr;
   }
 
   return winner->viewedge();
@@ -194,9 +194,9 @@ ViewVertex *ViewMap::InsertViewVertex(SVertex *iVertex, vector<ViewEdge *> &newV
   const vector<FEdge *> &fedges = iVertex->fedges();
   if (fedges.size() != 2) {
     cerr << "ViewMap warning: Can't split the ViewEdge" << endl;
-    return NULL;
+    return nullptr;
   }
-  FEdge *fend(NULL), *fbegin(NULL);
+  FEdge *fend(nullptr), *fbegin(nullptr);
   for (vector<FEdge *>::const_iterator fe = fedges.begin(), feend = fedges.end(); fe != feend;
        ++fe) {
     if ((*fe)->vertexB() == iVertex) {
@@ -205,7 +205,7 @@ ViewVertex *ViewMap::InsertViewVertex(SVertex *iVertex, vector<ViewEdge *> &newV
     if ((*fe)->vertexA() == iVertex) {
       fbegin = (*fe);
     }
-    if ((fbegin != NULL) && (fend != NULL)) {
+    if ((fbegin != nullptr) && (fend != nullptr)) {
       break;
     }
   }
@@ -213,7 +213,7 @@ ViewVertex *ViewMap::InsertViewVertex(SVertex *iVertex, vector<ViewEdge *> &newV
   ViewShape *vshape = ioEdge->viewShape();
   vva = new NonTVertex(iVertex);
   // if the ViewEdge is a closed loop, we don't create a new VEdge
-  if (ioEdge->A() == 0) {
+  if (ioEdge->A() == nullptr) {
     // closed loop
     ioEdge->setA(vva);
     ioEdge->setB(vva);
@@ -225,8 +225,8 @@ ViewVertex *ViewMap::InsertViewVertex(SVertex *iVertex, vector<ViewEdge *> &newV
     ioEdge->setFEdgeB(fend);
 
     // Update FEdges
-    fend->setNextEdge(NULL);
-    fbegin->setPreviousEdge(NULL);
+    fend->setNextEdge(nullptr);
+    fbegin->setPreviousEdge(nullptr);
 
     // update new View Vertex:
     vva->AddOutgoingViewEdge(ioEdge);
@@ -246,8 +246,8 @@ ViewVertex *ViewMap::InsertViewVertex(SVertex *iVertex, vector<ViewEdge *> &newV
     ioEdge->setFEdgeB(fend);
 
     // Update FEdges
-    fend->setNextEdge(NULL);
-    fbegin->setPreviousEdge(NULL);
+    fend->setNextEdge(nullptr);
+    fbegin->setPreviousEdge(nullptr);
 
     // update new View Vertex:
     vva->AddOutgoingViewEdge(newVEdge);
@@ -711,56 +711,56 @@ ViewEdge::const_fedge_iterator ViewEdge::fedge_iterator_last() const
 
 ViewEdge::fedge_iterator ViewEdge::fedge_iterator_end()
 {
-  return fedge_iterator(0, this->_FEdgeB);
+  return fedge_iterator(nullptr, this->_FEdgeB);
 }
 
 ViewEdge::const_fedge_iterator ViewEdge::fedge_iterator_end() const
 {
-  return const_fedge_iterator(0, this->_FEdgeB);
+  return const_fedge_iterator(nullptr, this->_FEdgeB);
 }
 
 //! embedding vertex iterator
 ViewEdge::const_vertex_iterator ViewEdge::vertices_begin() const
 {
-  return const_vertex_iterator(this->_FEdgeA->vertexA(), 0, _FEdgeA);
+  return const_vertex_iterator(this->_FEdgeA->vertexA(), nullptr, _FEdgeA);
 }
 
 ViewEdge::vertex_iterator ViewEdge::vertices_begin()
 {
-  return vertex_iterator(this->_FEdgeA->vertexA(), 0, _FEdgeA);
+  return vertex_iterator(this->_FEdgeA->vertexA(), nullptr, _FEdgeA);
 }
 
 ViewEdge::const_vertex_iterator ViewEdge::vertices_last() const
 {
-  return const_vertex_iterator(this->_FEdgeB->vertexB(), _FEdgeB, 0);
+  return const_vertex_iterator(this->_FEdgeB->vertexB(), _FEdgeB, nullptr);
 }
 
 ViewEdge::vertex_iterator ViewEdge::vertices_last()
 {
-  return vertex_iterator(this->_FEdgeB->vertexB(), _FEdgeB, 0);
+  return vertex_iterator(this->_FEdgeB->vertexB(), _FEdgeB, nullptr);
 }
 
 ViewEdge::const_vertex_iterator ViewEdge::vertices_end() const
 {
-  return const_vertex_iterator(0, _FEdgeB, 0);
+  return const_vertex_iterator(nullptr, _FEdgeB, nullptr);
 }
 
 ViewEdge::vertex_iterator ViewEdge::vertices_end()
 {
-  return vertex_iterator(0, _FEdgeB, 0);
+  return vertex_iterator(nullptr, _FEdgeB, nullptr);
 }
 
 Interface0DIterator ViewEdge::verticesBegin()
 {
   Interface0DIterator ret(new ViewEdgeInternal::SVertexIterator(
-      this->_FEdgeA->vertexA(), this->_FEdgeA->vertexA(), NULL, _FEdgeA, 0.0f));
+      this->_FEdgeA->vertexA(), this->_FEdgeA->vertexA(), nullptr, _FEdgeA, 0.0f));
   return ret;
 }
 
 Interface0DIterator ViewEdge::verticesEnd()
 {
   Interface0DIterator ret(new ViewEdgeInternal::SVertexIterator(
-      NULL, this->_FEdgeA->vertexA(), _FEdgeB, NULL, getLength2D()));
+      nullptr, this->_FEdgeA->vertexA(), _FEdgeB, nullptr, getLength2D()));
   return ret;
 }
 
@@ -795,7 +795,7 @@ ViewShape::~ViewShape()
 
   if (_SShape) {
     delete _SShape;
-    _SShape = NULL;
+    _SShape = nullptr;
   }
 }
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
index 91f3aeac184..de30ee0460a 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
@@ -61,7 +61,7 @@ static void findOccludee(FEdge *fe,
                          Vec3r &edgeDir,
                          vector<WVertex *> &faceVertices)
 {
-  WFace *face = NULL;
+  WFace *face = nullptr;
   if (fe->isSmooth()) {
     FEdgeSmooth *fes = dynamic_cast<FEdgeSmooth *>(fe);
     face = (WFace *)fes->face();
@@ -71,7 +71,7 @@ static void findOccludee(FEdge *fe,
 
   WVertex::incoming_edge_iterator ie;
 
-  *oaWFace = NULL;
+  *oaWFace = nullptr;
   if (((fe)->getNature() & Nature::SILHOUETTE) || ((fe)->getNature() & Nature::BORDER)) {
     // we cast a ray from A in the same direction but looking behind
     Vec3r v(-u[0], -u[1], -u[2]);
@@ -90,7 +90,7 @@ static void findOccludee(FEdge *fe,
       real d = -((p->getVertices())[0] * p->getNormal());
       real t, t_u, t_v;
 
-      if (0 != face) {
+      if (nullptr != face) {
         skipFace = false;
 
         if (face == oface) {
@@ -110,7 +110,7 @@ static void findOccludee(FEdge *fe,
           WVertex::incoming_edge_iterator iebegin = (*fv)->incoming_edges_begin();
           WVertex::incoming_edge_iterator ieend = (*fv)->incoming_edges_end();
           for (ie = iebegin; ie != ieend; ++ie) {
-            if ((*ie) == 0) {
+            if ((*ie) == nullptr) {
               continue;
             }
 
@@ -172,7 +172,7 @@ static void findOccludee(FEdge *fe,
     }
 
     if (noIntersection) {
-      *oaWFace = NULL;
+      *oaWFace = nullptr;
     }
   }
 }
@@ -198,7 +198,7 @@ static void findOccludee(FEdge *fe, G &grid, real epsilon, ViewEdge * /*ve*/, WF
 
   vector<WVertex *> faceVertices;
 
-  WFace *face = NULL;
+  WFace *face = nullptr;
   if (fe->isSmooth()) {
     FEdgeSmooth *fes = dynamic_cast<FEdgeSmooth *>(fe);
     face = (WFace *)fes->face();
@@ -245,7 +245,7 @@ static int computeVisibility(ViewMap *viewMap,
   real raylength = u.norm();
   u.normalize();
 
-  WFace *face = NULL;
+  WFace *face = nullptr;
   if (fe->isSmooth()) {
     FEdgeSmooth *fes = dynamic_cast<FEdgeSmooth *>(fe);
     face = (WFace *)fes->face();
@@ -330,7 +330,7 @@ static int computeVisibility(ViewMap *viewMap,
         WVertex::incoming_edge_iterator iebegin = (*fv)->incoming_edges_begin();
         WVertex::incoming_edge_iterator ieend = (*fv)->incoming_edges_end();
         for (ie = iebegin; ie != ieend; ++ie) {
-          if ((*ie) == 0) {
+          if ((*ie) == nullptr) {
             continue;
           }
 
@@ -400,7 +400,7 @@ static int computeVisibility(ViewMap *viewMap,
             cout << "\t\tIs occluder" << endl;
           }
 #endif
-          if (foundOccluders != NULL) {
+          if (foundOccluders != nullptr) {
             ViewShape *vshape = viewMap->viewShape(oface->GetVertex(0)->shape()->GetId());
             foundOccluders->insert(vshape);
           }
@@ -443,7 +443,7 @@ static void computeCumulativeVisibility(ViewMap *ioViewMap,
   FEdge *fe, *festart;
   int nSamples = 0;
   vector<WFace *> wFaces;
-  WFace *wFace = NULL;
+  WFace *wFace = nullptr;
   unsigned cnt = 0;
   unsigned cntStep = (unsigned)ceil(0.01f * vedges.size());
   unsigned tmpQI = 0;
@@ -472,7 +472,7 @@ static void computeCumulativeVisibility(ViewMap *ioViewMap,
     if (!(*ve)->isInImage()) {
       // This view edge has been proscenium culled
       (*ve)->setQI(255);
-      (*ve)->setaShape(0);
+      (*ve)->setaShape(nullptr);
 #if LOGGING
       if (_global.debug & G_DEBUG_FREESTYLE) {
         cout << "\tCulled." << endl;
@@ -486,7 +486,7 @@ static void computeCumulativeVisibility(ViewMap *ioViewMap,
     fe = (*ve)->fedgeA();
     qiMajority = 0;
     do {
-      if (fe != NULL && fe->isInImage()) {
+      if (fe != nullptr && fe->isInImage()) {
         qiMajority++;
       }
       fe = fe->nextEdge();
@@ -501,7 +501,7 @@ static void computeCumulativeVisibility(ViewMap *ioViewMap,
       // We can recover from this error:
       // Treat this edge as fully visible with no occludee
       (*ve)->setQI(0);
-      (*ve)->setaShape(0);
+      (*ve)->setaShape(nullptr);
       continue;
     }
 
@@ -622,7 +622,7 @@ static void computeCumulativeVisibility(ViewMap *ioViewMap,
     // occludee --
     if (!wFaces.empty()) {
       if (wFaces.size() <= (float)nSamples / 2.0f) {
-        (*ve)->setaShape(0);
+        (*ve)->setaShape(nullptr);
       }
       else {
         ViewShape *vshape = ioViewMap->viewShape(
@@ -652,7 +652,7 @@ static void computeDetailedVisibility(ViewMap *ioViewMap,
   FEdge *fe, *festart;
   int nSamples = 0;
   vector<WFace *> wFaces;
-  WFace *wFace = NULL;
+  WFace *wFace = nullptr;
   unsigned tmpQI = 0;
   unsigned qiClasses[256];
   unsigned maxIndex, maxCard;
@@ -670,7 +670,7 @@ static void computeDetailedVisibility(ViewMap *ioViewMap,
     if (!(*ve)->isInImage()) {
       // This view edge has been proscenium culled
       (*ve)->setQI(255);
-      (*ve)->setaShape(0);
+      (*ve)->setaShape(nullptr);
 #if LOGGING
       if (_global.debug & G_DEBUG_FREESTYLE) {
         cout << "\tCulled." << endl;
@@ -684,7 +684,7 @@ static void computeDetailedVisibility(ViewMap *ioViewMap,
     fe = (*ve)->fedgeA();
     qiMajority = 0;
     do {
-      if (fe != NULL && fe->isInImage()) {
+      if (fe != nullptr && fe->isInImage()) {
         qiMajority++;
       }
       fe = fe->nextEdge();
@@ -699,7 +699,7 @@ static void computeDetailedVisibility(ViewMap *ioViewMap,
       // We can recover from this error:
       // Treat this edge as fully visible with no occludee
       (*ve)->setQI(0);
-      (*ve)->setaShape(0);
+      (*ve)->setaShape(nullptr);
       continue;
     }
 
@@ -721,7 +721,7 @@ static void computeDetailedVisibility(ViewMap *ioViewMap,
 
     fe = (*ve)->fedgeA();
     do {
-      if (fe == NULL || !fe->isInImage()) {
+      if (fe == nullptr || !fe->isInImage()) {
         fe = fe->nextEdge();
         continue;
       }
@@ -811,7 +811,7 @@ static void computeDetailedVisibility(ViewMap *ioViewMap,
     // occludee --
     if (!wFaces.empty()) {
       if (wFaces.size() <= (float)nSamples / 2.0f) {
-        (*ve)->setaShape(0);
+        (*ve)->setaShape(nullptr);
       }
       else {
         ViewShape *vshape = ioViewMap->viewShape(
@@ -832,7 +832,7 @@ static void computeFastVisibility(ViewMap *ioViewMap, G &grid, real epsilon)
   FEdge *fe, *festart;
   unsigned nSamples = 0;
   vector<WFace *> wFaces;
-  WFace *wFace = NULL;
+  WFace *wFace = nullptr;
   unsigned tmpQI = 0;
   unsigned qiClasses[256];
   unsigned maxIndex, maxCard;
@@ -843,7 +843,7 @@ static void computeFastVisibility(ViewMap *ioViewMap, G &grid, real epsilon)
     if (!(*ve)->isInImage()) {
       // This view edge has been proscenium culled
       (*ve)->setQI(255);
-      (*ve)->setaShape(0);
+      (*ve)->setaShape(nullptr);
       continue;
     }
 
@@ -870,7 +870,7 @@ static void computeFastVisibility(ViewMap *ioViewMap, G &grid, real epsilon)
       // We can recover from this error:
       // Treat this edge as fully visible with no occludee
       (*ve)->setQI(0);
-      (*ve)->setaShape(0);
+      (*ve)->setaShape(nullptr);
       continue;
     }
 
@@ -945,7 +945,7 @@ static void computeFastVisibility(ViewMap *ioViewMap, G &grid, real epsilon)
     // occludee --
     if (!wFaces.empty()) {
       if (wFaces.size() < nSamples / 2) {
-        (*ve)->setaShape(0);
+        (*ve)->setaShape(nullptr);
       }
       else {
         ViewShape *vshape = ioViewMap->viewShape(
@@ -965,14 +965,14 @@ static void computeVeryFastVisibility(ViewMap *ioViewMap, G &grid, real epsilon)
 
   FEdge *fe;
   unsigned qi = 0;
-  WFace *wFace = 0;
+  WFace *wFace = nullptr;
 
   for (vector<ViewEdge *>::iterator ve = vedges.begin(), veend = vedges.end(); ve != veend; ve++) {
     // Find an edge to test
     if (!(*ve)->isInImage()) {
       // This view edge has been proscenium culled
       (*ve)->setQI(255);
-      (*ve)->setaShape(0);
+      (*ve)->setaShape(nullptr);
       continue;
     }
     fe = (*ve)->fedgeA();
@@ -992,7 +992,7 @@ static void computeVeryFastVisibility(ViewMap *ioViewMap, G &grid, real epsilon)
       // We can recover from this error:
       // Treat this edge as fully visible with no occludee
       qi = 0;
-      wFace = NULL;
+      wFace = nullptr;
     }
     else {
       qi = computeVisibility<G, I>(ioViewMap, fe, grid, epsilon, *ve, &wFace, NULL);
@@ -1011,7 +1011,7 @@ static void computeVeryFastVisibility(ViewMap *ioViewMap, G &grid, real epsilon)
       (*ve)->setaShape(vshape);
     }
     else {
-      (*ve)->setaShape(0);
+      (*ve)->setaShape(nullptr);
     }
     (*ve)->setQI(qi);
   }
@@ -1138,7 +1138,7 @@ void ViewMapBuilder::CullViewEdges(ViewMap *ioViewMap,
 
     // For each feature edge, while bestOccluderTarget not found and view edge not visible
     bool bestOccluderTargetFound = false;
-    FEdge *bestOccluderTarget = NULL;
+    FEdge *bestOccluderTarget = nullptr;
     real bestOccluderDistance = 0.0;
     FEdge *festart = (*ve)->fedgeA();
     FEdge *fe = festart;
@@ -1164,7 +1164,7 @@ void ViewMapBuilder::CullViewEdges(ViewMap *ioViewMap,
         else {
           real d = distance2D(fe->center2d(), prosceniumOrigin);
           // If center point is closer to viewport origin than current target
-          if (bestOccluderTarget == NULL || d < bestOccluderDistance) {
+          if (bestOccluderTarget == nullptr || d < bestOccluderDistance) {
             // Then store as bestOccluderTarget
             bestOccluderDistance = d;
             bestOccluderTarget = fe;
@@ -1189,7 +1189,7 @@ void ViewMapBuilder::CullViewEdges(ViewMap *ioViewMap,
 
     // If bestOccluderTarget was not found inside the occluder proscenium, we need to expand the
     // occluder proscenium to include it.
-    if ((*ve)->isInImage() && bestOccluderTarget != NULL && !bestOccluderTargetFound) {
+    if ((*ve)->isInImage() && bestOccluderTarget != nullptr && !bestOccluderTargetFound) {
       // Expand occluder proscenium to enclose bestOccluderTarget
       Vec3r point = bestOccluderTarget->center2d();
       if (point[0] < occluderProscenium[0]) {
@@ -1337,7 +1337,7 @@ void ViewMapBuilder::computeCusps(ViewMap *ioViewMap)
         first = false;
       }
       // If we're in a positive part, we need a stronger negative value to change
-      NonTVertex *cusp = NULL;
+      NonTVertex *cusp = nullptr;
       if (positive) {
         if (((crossP) * (viewvector)) < -0.1) {
           // state changes
@@ -1556,7 +1556,7 @@ void ViewMapBuilder::ComputeRayCastingVisibility(ViewMap *ioViewMap, real epsilo
   unsigned vEdgesSize = vedges.size();
   unsigned fEdgesSize = ioViewMap->FEdges().size();
 
-  if (_pProgressBar != NULL && fEdgesSize > gProgressBarMinSize) {
+  if (_pProgressBar != nullptr && fEdgesSize > gProgressBarMinSize) {
     unsigned progressBarSteps = min(gProgressBarMaxSteps, vEdgesSize);
     progressBarStep = vEdgesSize / progressBarSteps;
     _pProgressBar->reset();
@@ -1570,7 +1570,7 @@ void ViewMapBuilder::ComputeRayCastingVisibility(ViewMap *ioViewMap, real epsilo
   FEdge *fe, *festart;
   int nSamples = 0;
   vector<Polygon3r *> aFaces;
-  Polygon3r *aFace = NULL;
+  Polygon3r *aFace = nullptr;
   unsigned tmpQI = 0;
   unsigned qiClasses[256];
   unsigned maxIndex, maxCard;
@@ -1683,7 +1683,7 @@ void ViewMapBuilder::ComputeRayCastingVisibility(ViewMap *ioViewMap, real epsilo
     // occludee --
     if (!aFaces.empty()) {
       if (aFaces.size() <= (float)nSamples / 2.0f) {
-        (*ve)->setaShape(0);
+        (*ve)->setaShape(nullptr);
       }
       else {
         vector<Polygon3r *>::iterator p = aFaces.begin();
@@ -1713,7 +1713,7 @@ void ViewMapBuilder::ComputeFastRayCastingVisibility(ViewMap *ioViewMap, real ep
   unsigned vEdgesSize = vedges.size();
   unsigned fEdgesSize = ioViewMap->FEdges().size();
 
-  if (_pProgressBar != NULL && fEdgesSize > gProgressBarMinSize) {
+  if (_pProgressBar != nullptr && fEdgesSize > gProgressBarMinSize) {
     unsigned progressBarSteps = min(gProgressBarMaxSteps, vEdgesSize);
     progressBarStep = vEdgesSize / progressBarSteps;
     _pProgressBar->reset();
@@ -1727,7 +1727,7 @@ void ViewMapBuilder::ComputeFastRayCastingVisibility(ViewMap *ioViewMap, real ep
   FEdge *fe, *festart;
   unsigned nSamples = 0;
   vector<Polygon3r *> aFaces;
-  Polygon3r *aFace = NULL;
+  Polygon3r *aFace = nullptr;
   unsigned tmpQI = 0;
   unsigned qiClasses[256];
   unsigned maxIndex, maxCard;
@@ -1801,7 +1801,7 @@ void ViewMapBuilder::ComputeFastRayCastingVisibility(ViewMap *ioViewMap, real ep
 
     if (!aFaces.empty()) {
       if (aFaces.size() < nSamples / 2) {
-        (*ve)->setaShape(0);
+        (*ve)->setaShape(nullptr);
       }
       else {
         vector<Polygon3r *>::iterator p = aFaces.begin();
@@ -1846,7 +1846,7 @@ void ViewMapBuilder::ComputeVeryFastRayCastingVisibility(ViewMap *ioViewMap, rea
   unsigned vEdgesSize = vedges.size();
   unsigned fEdgesSize = ioViewMap->FEdges().size();
 
-  if (_pProgressBar != NULL && fEdgesSize > gProgressBarMinSize) {
+  if (_pProgressBar != nullptr && fEdgesSize > gProgressBarMinSize) {
     unsigned progressBarSteps = min(gProgressBarMaxSteps, vEdgesSize);
     progressBarStep = vEdgesSize / progressBarSteps;
     _pProgressBar->reset();
@@ -1859,7 +1859,7 @@ void ViewMapBuilder::ComputeVeryFastRayCastingVisibility(ViewMap *ioViewMap, rea
   unsigned counter = progressBarStep;
   FEdge *fe;
   unsigned qi = 0;
-  Polygon3r *aFace = NULL;
+  Polygon3r *aFace = nullptr;
   static unsigned timestamp = 1;
   for (vector<ViewEdge *>::iterator ve = vedges.begin(), veend = vedges.end(); ve != veend; ve++) {
     if (_pRenderMonitor && _pRenderMonitor->testBreak()) {
@@ -1877,7 +1877,7 @@ void ViewMapBuilder::ComputeVeryFastRayCastingVisibility(ViewMap *ioViewMap, rea
       (*ve)->setaShape(vshape);
     }
     else {
-      (*ve)->setaShape(0);
+      (*ve)->setaShape(nullptr);
     }
 
     (*ve)->setQI(qi);
@@ -1903,7 +1903,7 @@ void ViewMapBuilder::FindOccludee(FEdge *fe,
                                   Vec3r &edgeDir,
                                   vector<WVertex *> &faceVertices)
 {
-  WFace *face = NULL;
+  WFace *face = nullptr;
   if (fe->isSmooth()) {
     FEdgeSmooth *fes = dynamic_cast<FEdgeSmooth *>(fe);
     face = (WFace *)fes->face();
@@ -1915,7 +1915,7 @@ void ViewMapBuilder::FindOccludee(FEdge *fe,
   WVertex::incoming_edge_iterator ie;
   OccludersSet::iterator p, pend;
 
-  *oaPolygon = NULL;
+  *oaPolygon = nullptr;
   if (((fe)->getNature() & Nature::SILHOUETTE) || ((fe)->getNature() & Nature::BORDER)) {
     occluders.clear();
     // we cast a ray from A in the same direction but looking behind
@@ -1955,7 +1955,7 @@ void ViewMapBuilder::FindOccludee(FEdge *fe,
           WVertex::incoming_edge_iterator iebegin = (*fv)->incoming_edges_begin();
           WVertex::incoming_edge_iterator ieend = (*fv)->incoming_edges_end();
           for (ie = iebegin; ie != ieend; ++ie) {
-            if ((*ie) == 0) {
+            if ((*ie) == nullptr) {
               continue;
             }
 
@@ -1994,7 +1994,7 @@ void ViewMapBuilder::FindOccludee(FEdge *fe,
     }
 
     if (noIntersection) {
-      *oaPolygon = NULL;
+      *oaPolygon = nullptr;
     }
   }
 }
@@ -2026,7 +2026,7 @@ void ViewMapBuilder::FindOccludee(
 
   vector<WVertex *> faceVertices;
 
-  WFace *face = NULL;
+  WFace *face = nullptr;
   if (fe->isSmooth()) {
     FEdgeSmooth *fes = dynamic_cast<FEdgeSmooth *>(fe);
     face = (WFace *)fes->face();
@@ -2101,7 +2101,7 @@ int ViewMapBuilder::ComputeRayCastingVisibility(FEdge *fe,
 
   iGrid->castRay(center, vp, occluders, timestamp);
 
-  WFace *face = NULL;
+  WFace *face = nullptr;
   if (fe->isSmooth()) {
     FEdgeSmooth *fes = dynamic_cast<FEdgeSmooth *>(fe);
     face = (WFace *)fes->face();
@@ -2168,7 +2168,7 @@ int ViewMapBuilder::ComputeRayCastingVisibility(FEdge *fe,
         WVertex::incoming_edge_iterator iebegin = (*fv)->incoming_edges_begin();
         WVertex::incoming_edge_iterator ieend = (*fv)->incoming_edges_end();
         for (ie = iebegin; ie != ieend; ++ie) {
-          if ((*ie) == 0) {
+          if ((*ie) == nullptr) {
             continue;
           }
 
@@ -2358,7 +2358,7 @@ void ViewMapBuilder::ComputeSweepLineIntersections(ViewMap *ioViewMap, real epsi
 #endif
   unsigned progressBarStep = 0;
 
-  if (_pProgressBar != NULL && fEdgesSize > gProgressBarMinSize) {
+  if (_pProgressBar != nullptr && fEdgesSize > gProgressBarMinSize) {
     unsigned progressBarSteps = min(gProgressBarMaxSteps, sVerticesSize);
     progressBarStep = sVerticesSize / progressBarSteps;
     _pProgressBar->reset();
@@ -2428,7 +2428,7 @@ void ViewMapBuilder::ComputeSweepLineIntersections(ViewMap *ioViewMap, real epsi
 
   // reset userdata:
   for (fe = ioEdges.begin(), fend = ioEdges.end(); fe != fend; fe++) {
-    (*fe)->userdata = NULL;
+    (*fe)->userdata = nullptr;
   }
 
   // list containing the new edges resulting from splitting operations.
@@ -2561,7 +2561,7 @@ void ViewMapBuilder::ComputeSweepLineIntersections(ViewMap *ioViewMap, real epsi
 
   // reset userdata:
   for (fe = ioEdges.begin(), fend = ioEdges.end(); fe != fend; fe++) {
-    (*fe)->userdata = NULL;
+    (*fe)->userdata = nullptr;
   }
 
   // delete segments
diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
index 3cbf42ed388..d71bc5758c9 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
@@ -228,8 +228,8 @@ static int load(istream &in, FEdge *fe)
 
   bool b;
 
-  FEdgeSmooth *fesmooth = NULL;
-  FEdgeSharp *fesharp = NULL;
+  FEdgeSmooth *fesmooth = nullptr;
+  FEdgeSharp *fesharp = nullptr;
   if (fe->isSmooth()) {
     fesmooth = dynamic_cast<FEdgeSmooth *>(fe);
   }
@@ -1239,25 +1239,25 @@ int save(ostream &out, ViewMap *vm, ProgressBar *pb)
   for (vector<ViewShape *>::const_iterator j0 = vm->ViewShapes().begin();
        j0 != vm->ViewShapes().end();
        j0++) {
-    (*j0)->userdata = NULL;
-    (*j0)->sshape()->userdata = NULL;
+    (*j0)->userdata = nullptr;
+    (*j0)->sshape()->userdata = nullptr;
   }
   for (vector<FEdge *>::const_iterator j1 = vm->FEdges().begin(); j1 != vm->FEdges().end(); j1++) {
-    (*j1)->userdata = NULL;
+    (*j1)->userdata = nullptr;
   }
   for (vector<SVertex *>::const_iterator j2 = vm->SVertices().begin(); j2 != vm->SVertices().end();
        j2++) {
-    (*j2)->userdata = NULL;
+    (*j2)->userdata = nullptr;
   }
   for (vector<ViewEdge *>::const_iterator j3 = vm->ViewEdges().begin();
        j3 != vm->ViewEdges().end();
        j3++) {
-    (*j3)->userdata = NULL;
+    (*j3)->userdata = nullptr;
   }
   for (vector<ViewVertex *>::const_iterator j4 = vm->ViewVertices().begin();
        j4 != vm->ViewVertices().end();
        j4++) {
-    (*j4)->userdata = NULL;
+    (*j4)->userdata = nullptr;
   }
   SET_PROGRESS(6);
 
diff --git a/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp b/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp
index a1f76c120fb..9b87bf762fa 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp
@@ -26,7 +26,7 @@ namespace Freestyle {
 NodeGroup *ViewMapTesselator::Tesselate(ViewMap *iViewMap)
 {
   if (iViewMap->ViewEdges().empty()) {
-    return NULL;
+    return nullptr;
   }
 
   const vector<ViewEdge *> &viewedges = iViewMap->ViewEdges();
@@ -35,7 +35,7 @@ NodeGroup *ViewMapTesselator::Tesselate(ViewMap *iViewMap)
 
 NodeGroup *ViewMapTesselator::Tesselate(WShape *UNUSED(iWShape))
 {
-  return NULL;
+  return nullptr;
 }
 
 } /* namespace Freestyle */