[Bf-blender-cvs] [4e8c2cfd1c7] soc-2020-io-performance: Cleanup: Importer: NULL to nullptr.

[Ankit Meel]

Commit: 4e8c2cfd1c7cbe7058e0ddc7c79ab02a7167c1bb
Author: Ankit Meel
Date:   Sat Nov 7 18:32:04 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB4e8c2cfd1c7cbe7058e0ddc7c79ab02a7167c1bb

Cleanup: Importer: NULL to nullptr.

===================================================================

M	source/blender/io/wavefront_obj/importer/importer_mesh_utils.cc
M	source/blender/io/wavefront_obj/importer/obj_import_mesh.cc

===================================================================

diff --git a/source/blender/io/wavefront_obj/importer/importer_mesh_utils.cc b/source/blender/io/wavefront_obj/importer/importer_mesh_utils.cc
index 261a8e9de80..faf62e097c5 100644
--- a/source/blender/io/wavefront_obj/importer/importer_mesh_utils.cc
+++ b/source/blender/io/wavefront_obj/importer/importer_mesh_utils.cc
@@ -110,7 +110,7 @@ static void tessellate_polygon(const Vector<Vector<float3>> &polyLineSeq,
 {
   int64_t totpoints = 0;
   /* Display #ListBase. */
-  ListBase dispbase = {NULL, NULL};
+  ListBase dispbase = {nullptr, nullptr};
   const int64_t len_polylines{polyLineSeq.size()};
 
   for (int i = 0; i < len_polylines; i++) {
@@ -138,7 +138,7 @@ static void tessellate_polygon(const Vector<Vector<float3>> &polyLineSeq,
 
   if (totpoints) {
     /* now make the list to fill */
-    BKE_displist_fill(&dispbase, &dispbase, NULL, false);
+    BKE_displist_fill(&dispbase, &dispbase, nullptr, false);
 
     /* The faces are stored in a new DisplayList
      * that's added to the head of the #ListBase. */
diff --git a/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc b/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc
index 055dbfc4955..c63edd1939a 100644
--- a/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc
+++ b/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc
@@ -204,7 +204,7 @@ void MeshFromGeometry::dissolve_edges(const Set<std::pair<int, int>> &fgon_edges
                false,
                false);
   unique_mesh_ptr to_free = std::move(blender_mesh_);
-  blender_mesh_.reset(BKE_mesh_from_bmesh_for_eval_nomain(bmesh, NULL, to_free.get()));
+  blender_mesh_.reset(BKE_mesh_from_bmesh_for_eval_nomain(bmesh, nullptr, to_free.get()));
   to_free.reset();
   BM_mesh_free(bmesh);
 }