[Bf-blender-cvs] [b22b962ca23] soc-2020-io-performance: Silence some warnings; minor changes.

[Ankit Meel]

Commit: b22b962ca238d9f1b1d3717b0d2637bb0d28cce7
Author: Ankit Meel
Date:   Sat Aug 22 12:35:29 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rBb22b962ca238d9f1b1d3717b0d2637bb0d28cce7

Silence some warnings; minor changes.

Since `map_bump_strength` was changed to have a
leading space, length should be increased too.

Pass by reference to avoid copy.

Release resources if not moved by the owner in Mesh and
Curve creation code.

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

M	source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.cc
M	source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc
M	source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc
M	source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.hh
M	source/blender/io/wavefront_obj/intern/wavefront_obj_im_nurbs.cc

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

diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.cc
index e19dc5284a9..b23bf7cecd1 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.cc
@@ -486,7 +486,7 @@ void MTLWriter::append_materials(const OBJMesh &mesh_to_export)
       if (texture_map.value.image_path.empty()) {
         continue;
       }
-      std::string map_bump_strength{"", 12};
+      std::string map_bump_strength{"", 13};
       if (texture_map.key == "map_Bump" && mtl_material.map_Bump_strength > -0.9f) {
         map_bump_strength = " -bm " + std::to_string(mtl_material.map_Bump_strength);
       }
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc
index 43315f25dcf..30d35be9a57 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc
@@ -74,9 +74,6 @@ OBJMesh::OBJMesh(Depsgraph *depsgraph, const OBJExportParams &export_params, Obj
       }
       break;
     }
-    case OB_CURVE: {
-      break;
-    }
     default: {
       break;
     }
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc
index ebc788c258e..4b1b153bb0f 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc
@@ -49,8 +49,10 @@ namespace blender::io::obj {
 
 MeshFromGeometry::~MeshFromGeometry()
 {
-  if (mesh_object_) {
+  if (mesh_object_ || blender_mesh_) {
     /* Move the object to own it. */
+    mesh_object_.reset();
+    blender_mesh_.reset();
     BLI_assert(0);
   }
 }
@@ -167,7 +169,7 @@ std::pair<int64_t, int64_t> MeshFromGeometry::tessellate_polygons(
   return std::make_pair(removed_faces, removed_loops);
 }
 
-void MeshFromGeometry::dissolve_edges(const Set<std::pair<int, int>> fgon_edges)
+void MeshFromGeometry::dissolve_edges(const Set<std::pair<int, int>> &fgon_edges)
 {
   if (fgon_edges.is_empty()) {
     return;
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.hh
index 036f2e489d3..57f16a30358 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.hh
@@ -85,7 +85,7 @@ class MeshFromGeometry : NonMovable, NonCopyable {
   void create_uv_verts();
   void create_materials(Main *bmain, const Map<std::string, MTLMaterial> &materials);
   void add_custom_normals();
-  void dissolve_edges(const Set<std::pair<int, int>> fgon_edges);
+  void dissolve_edges(const Set<std::pair<int, int>> &fgon_edges);
 };
 
 }  // namespace blender::io::obj
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_nurbs.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_nurbs.cc
index 4e4f370822e..73fe097ecdf 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_nurbs.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_nurbs.cc
@@ -32,8 +32,10 @@ namespace blender::io::obj {
 
 CurveFromGeometry::~CurveFromGeometry()
 {
-  if (curve_object_) {
+  if (curve_object_ || blender_curve_) {
     /* Move the object to own it. */
+    curve_object_.reset();
+    blender_curve_.reset();
     BLI_assert(0);
   }
 }