[Bf-blender-cvs] [30def30420e] soc-2020-io-performance: Cleanup

[Ankit Meel]

Commit: 30def30420e61c1a2ba38a1a14b320580a014d10
Author: Ankit Meel
Date:   Sat Dec 12 20:47:53 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB30def30420e61c1a2ba38a1a14b320580a014d10

Cleanup

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

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

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

diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc b/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
index 4be07be14a9..7a77095aad8 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
@@ -464,7 +464,7 @@ static std::string float3_to_string(const float3 &numbers)
 /*
  * Create the .MTL file.
  */
-MTLWriter::MTLWriter(const char *obj_filepath)
+MTLWriter::MTLWriter(const char *obj_filepath) noexcept(false)
 {
   mtl_filepath_ = obj_filepath;
   const bool ok = BLI_path_extension_replace(mtl_filepath_.data(), FILE_MAX, ".mtl");
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 b1f0e29f3d4..e30ea39638c 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
@@ -56,7 +56,7 @@ class OBJWriter : NonMovable, NonCopyable {
   IndexOffsets index_offsets_{0, 0, 0};
 
  public:
-  OBJWriter(const char *filepath, const OBJExportParams &export_params)
+  OBJWriter(const char *filepath, const OBJExportParams &export_params) noexcept(false)
       : export_params_(export_params)
   {
     file_handler_ = std::make_unique<FileHandler<eFileType::OBJ>>(filepath);
@@ -114,7 +114,7 @@ class MTLWriter : NonMovable, NonCopyable {
   std::string mtl_filepath_;
 
  public:
-  MTLWriter(const char *obj_filepath);
+  MTLWriter(const char *obj_filepath) noexcept(false);
 
   void write_header() const;
   StringRefNull mtl_file_path() const;
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_io.hh b/source/blender/io/wavefront_obj/exporter/obj_export_io.hh
index 1665414b027..a51e94a38e5 100644
--- a/source/blender/io/wavefront_obj/exporter/obj_export_io.hh
+++ b/source/blender/io/wavefront_obj/exporter/obj_export_io.hh
@@ -136,7 +136,7 @@ syntax_elem_to_formatting(const eOBJSyntaxElement key)
       return {"vn %f %f %f\n", 3, is_type_float<T...>};
     }
     case eOBJSyntaxElement::poly_element_begin: {
-      return {"f ", 0, is_type_string_related<T...>};
+      return {"f", 0, is_type_string_related<T...>};
     }
     case eOBJSyntaxElement::vertex_uv_normal_indices: {
       return {" %d/%d/%d", 3, is_type_integral<T...>};