[Bf-blender-cvs] [c5e0e82f68c] soc-2020-io-performance: Cleanup : clang format; cout > cerr

[Ankit Meel]

Commit: c5e0e82f68c76177ba3113d070a368298cc11e32
Author: Ankit Meel
Date:   Sun Aug 16 19:38:43 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rBc5e0e82f68c76177ba3113d070a368298cc11e32

Cleanup : clang format; cout > cerr

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

M	source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.hh
M	source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc
M	source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mtl.cc
M	source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.cc
M	source/blender/io/wavefront_obj/intern/wavefront_obj_im_mtl.hh
M	source/blender/io/wavefront_obj/intern/wavefront_obj_im_objects.hh
M	source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc

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

diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.hh
index 20bee120e3f..c0ed02c9f37 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.hh
@@ -25,9 +25,10 @@
 
 #include "DNA_meshdata_types.h"
 
-#include "IO_wavefront_obj.h"
 #include "BLI_vector.hh"
 
+#include "IO_wavefront_obj.h"
+
 namespace blender::io::obj {
 class OBJMesh;
 class OBJNurbs;
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 06a54d8e739..a278dcaa86d 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
@@ -36,10 +36,10 @@
 
 #include "DEG_depsgraph_query.h"
 
-#include "DNA_mesh_types.h"
-#include "DNA_object_types.h"
 #include "DNA_material_types.h"
+#include "DNA_mesh_types.h"
 #include "DNA_modifier_types.h"
+#include "DNA_object_types.h"
 
 #include "wavefront_obj_ex_mesh.hh"
 
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mtl.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mtl.cc
index ae3b641fbcf..3b83ad39e19 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mtl.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mtl.cc
@@ -37,7 +37,6 @@
 #include "wavefront_obj_ex_mtl.hh"
 #include "wavefront_obj_im_mtl.hh"
 
-
 namespace blender::io::obj {
 
 /**
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.cc
index f368f2afc5d..23528260259 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.cc
@@ -556,7 +556,7 @@ void MTLParser::parse_and_store(Map<string, MTLMaterial> &mtl_materials)
     else if (line_key.find("map_") != string::npos) {
       if (!current_mtlmaterial->texture_maps.contains_as(string(line_key))) {
         /* No supported texture map found. */
-        std::cout << "Texture map type not supported:'" << line_key << "'" << std::endl;
+        std::cerr << "Texture map type not supported:'" << line_key << "'" << std::endl;
         continue;
       }
       tex_map_XX &tex_map = current_mtlmaterial->texture_maps.lookup(string(line_key));
@@ -588,7 +588,6 @@ void MTLParser::parse_and_store(Map<string, MTLMaterial> &mtl_materials)
 
       /* Skip all unsupported options and arguments. */
       tex_map.image_path = string(skip_unsupported_options(rest_line));
-      std::cout << tex_map.image_path << std::endl;
       tex_map.mtl_dir_path = mtl_dir_path_;
     }
   }
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mtl.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mtl.hh
index 5ff301356a2..76f803c25ad 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mtl.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_mtl.hh
@@ -23,8 +23,6 @@
 
 #pragma once
 
-//#include <memory>
-
 #include "MEM_guardedalloc.h"
 
 #include "DNA_node_types.h"
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_objects.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_objects.hh
index 2847feb1924..cc27413111b 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_im_objects.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_objects.hh
@@ -30,12 +30,11 @@
 #include "BLI_float3.hh"
 #include "BLI_vector.hh"
 
-#include "DNA_object_types.h"
 #include "DNA_meshdata_types.h"
+#include "DNA_object_types.h"
 
 #include "wavefront_obj_ex_file_writer.hh"
 
-
 namespace blender::io::obj {
 
 /**
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
index b62b3d55c45..2b7c67b4b32 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
@@ -28,7 +28,6 @@
 #include "BLI_map.hh"
 #include "BLI_string_ref.hh"
 
-
 #include "wavefront_obj_im_file_reader.hh"
 #include "wavefront_obj_im_mesh.hh"
 #include "wavefront_obj_im_nurbs.hh"