[Bf-blender-cvs] [83ac5a0f5fb] soc-2020-io-performance: Minor fixes, use scoped_timer for export too.

[Ankit Meel]

Commit: 83ac5a0f5fbb199c737207a5c53b405d0d6810e1
Author: Ankit Meel
Date:   Thu Sep 3 16:08:47 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB83ac5a0f5fbb199c737207a5c53b405d0d6810e1

Minor fixes, use scoped_timer for export too.

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

M	source/blender/io/wavefront_obj/intern/obj_export_file_writer.cc
M	source/blender/io/wavefront_obj/intern/obj_export_mesh.cc
M	source/blender/io/wavefront_obj/intern/wavefront_obj.cc

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

diff --git a/source/blender/io/wavefront_obj/intern/obj_export_file_writer.cc b/source/blender/io/wavefront_obj/intern/obj_export_file_writer.cc
index e7855b7556d..aa8f84bc573 100644
--- a/source/blender/io/wavefront_obj/intern/obj_export_file_writer.cc
+++ b/source/blender/io/wavefront_obj/intern/obj_export_file_writer.cc
@@ -493,8 +493,8 @@ void MTLWriter::append_materials(const OBJMesh &mesh_to_export)
       if (texture_map.value.image_path.empty()) {
         continue;
       }
-      std::string map_bump_strength{"", 13};
-      if (texture_map.key == "map_Bump" && mtl_material.map_Bump_strength > -0.9f) {
+      std::string map_bump_strength;
+      if (texture_map.key == "map_Bump" && mtl_material.map_Bump_strength > 0.0001f) {
         map_bump_strength = " -bm " + std::to_string(mtl_material.map_Bump_strength);
       }
       /* Always keep only one space between options since filepaths may have leading spaces too.
@@ -508,7 +508,7 @@ void MTLWriter::append_materials(const OBJMesh &mesh_to_export)
               texture_map.value.scale[0],
               texture_map.value.scale[1],
               texture_map.value.scale[2],
-              map_bump_strength.c_str(),
+              map_bump_strength.c_str(), /* Can be empty. */
               texture_map.value.image_path.c_str());
     }
   }
diff --git a/source/blender/io/wavefront_obj/intern/obj_export_mesh.cc b/source/blender/io/wavefront_obj/intern/obj_export_mesh.cc
index 8e80f41df9e..d98e38a0c3c 100644
--- a/source/blender/io/wavefront_obj/intern/obj_export_mesh.cc
+++ b/source/blender/io/wavefront_obj/intern/obj_export_mesh.cc
@@ -279,7 +279,7 @@ const char *OBJMesh::get_object_material_name(short mat_nr) const
 {
   const Material *mat = BKE_object_material_get(export_object_eval_, mat_nr);
 #ifdef DEBUG
-  std::cerr << "Material not found for mat_nr" << mat_nr << std::endl;
+  std::cerr << "Material not found for mat_nr = " << mat_nr << std::endl;
 #endif
   return mat ? mat->id.name + 2 : nullptr;
 }
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj.cc
index 2e0d4a017fd..ccede04701b 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj.cc
@@ -37,14 +37,12 @@
  */
 void OBJ_export(bContext *C, const OBJExportParams *export_params)
 {
-  double start_time = PIL_check_seconds_timer();
+  SCOPED_TIMER(__func__);
   blender::io::obj::exporter_main(C, *export_params);
-  double end_time = PIL_check_seconds_timer();
-  std::cout << "\nOBJ export time: " << (end_time - start_time) * 1000 << " milliseconds\n";
 }
 
 /**
- *
+ * Time the full import process.
  */
 void OBJ_import(bContext *C, const OBJImportParams *import_params)
 {