[Bf-blender-cvs] [0bfa68c901f] soc-2020-io-performance: Cleanup: Exporter: NULL to nullptr, mismatching parameter name.

[Ankit Meel]

Commit: 0bfa68c901fdca2d1f289608036351cdf4dd7aa8
Author: Ankit Meel
Date:   Sat Nov 7 18:26:09 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB0bfa68c901fdca2d1f289608036351cdf4dd7aa8

Cleanup: Exporter: NULL to nullptr, mismatching parameter name.

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

M	source/blender/io/wavefront_obj/exporter/obj_export_file_writer.hh
M	source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc

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

diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.hh b/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.hh
index ec0cf9aeaad..bc793c135b1 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.hh
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.hh
@@ -75,7 +75,7 @@ class OBJWriter : NonMovable, NonCopyable {
                          const int last_poly_smooth_group) const;
   int16_t write_poly_material(const OBJMesh &obj_mesh_data,
                               const int poly_index,
-                              const int16_t last_face_mat_nr) const;
+                              const int16_t last_poly_mat_nr) const;
   int16_t write_vertex_group(const OBJMesh &obj_mesh_data,
                              const int poly_index,
                              const int16_t last_poly_vertex_group) const;
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
index 99c426b4283..ac1d1e481be 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
@@ -83,7 +83,7 @@ OBJMesh::~OBJMesh()
 void OBJMesh::free_mesh_if_needed()
 {
   if (mesh_eval_needs_free_ && export_mesh_eval_) {
-    BKE_id_free(NULL, export_mesh_eval_);
+    BKE_id_free(nullptr, export_mesh_eval_);
   }
 }
 
@@ -111,11 +111,12 @@ std::pair<Mesh *, bool> OBJMesh::triangulate_mesh_eval()
                       MOD_TRIANGULATE_QUAD_SHORTEDGE,
                       triangulate_min_verts,
                       false,
-                      NULL,
-                      NULL,
-                      NULL);
+                      nullptr,
+                      nullptr,
+                      nullptr);
 
-  Mesh *triangulated = BKE_mesh_from_bmesh_for_eval_nomain(bmesh.get(), NULL, export_mesh_eval_);
+  Mesh *triangulated = BKE_mesh_from_bmesh_for_eval_nomain(
+      bmesh.get(), nullptr, export_mesh_eval_);
   free_mesh_if_needed();
   return {triangulated, true};
 }