1 files changed, 10 insertions, 14 deletions

diff --git a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
index 3cbf42ed388..aed5d6b5adc 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
@@ -50,9 +50,7 @@
   } \
   (void)0
 
-namespace Freestyle {
-
-namespace ViewMapIO {
+namespace Freestyle::ViewMapIO {
 
 namespace Internal {
 
@@ -228,8 +226,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 +1237,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);
 
@@ -1307,6 +1305,4 @@ string getModelsPath()
 
 }  // namespace Options
 
-}  // End of namespace ViewMapIO
-
-} /* namespace Freestyle */
+}  // namespace Freestyle::ViewMapIO