[Bf-blender-cvs] [33bd98a97bd] soc-2020-io-performance: Remove duplicate MTLMaterial, tex_map_XX. clean-up headers.

[Ankit Meel]

Commit: 33bd98a97bd68b675d462a020218bc9d88601822
Author: Ankit Meel
Date:   Mon Sep 21 16:10:35 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB33bd98a97bd68b675d462a020218bc9d88601822

Remove duplicate MTLMaterial, tex_map_XX. clean-up headers.

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

M	source/blender/io/wavefront_obj/intern/obj_export_mtl.hh
M	source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc
M	source/blender/io/wavefront_obj/intern/obj_import_objects.hh

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

diff --git a/source/blender/io/wavefront_obj/intern/obj_export_mtl.hh b/source/blender/io/wavefront_obj/intern/obj_export_mtl.hh
index af287b6c071..a1b4950d730 100644
--- a/source/blender/io/wavefront_obj/intern/obj_export_mtl.hh
+++ b/source/blender/io/wavefront_obj/intern/obj_export_mtl.hh
@@ -33,6 +33,7 @@
 #include "obj_export_mesh.hh"
 
 namespace blender::io::obj {
+class OBJMesh;
 
 /**
  * Generic container for texture node properties.
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc b/source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc
index f3911c724cd..585b276ce34 100644
--- a/source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc
+++ b/source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc
@@ -28,10 +28,10 @@
 #include "BLI_string_ref.hh"
 #include "BLI_vector.hh"
 
-#include "obj_export_file_writer.hh"
-#include "obj_import_file_reader.hh"
 #include "parser_string_utils.hh"
 
+#include "obj_import_file_reader.hh"
+
 namespace blender::io::obj {
 
 using std::string;
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_objects.hh b/source/blender/io/wavefront_obj/intern/obj_import_objects.hh
index 12a93233ab3..da156c39117 100644
--- a/source/blender/io/wavefront_obj/intern/obj_import_objects.hh
+++ b/source/blender/io/wavefront_obj/intern/obj_import_objects.hh
@@ -33,8 +33,6 @@
 #include "DNA_meshdata_types.h"
 #include "DNA_object_types.h"
 
-#include "obj_export_file_writer.hh"
-
 namespace blender::io::obj {
 
 /**