[Bf-blender-cvs] [582bf4397cf] soc-2020-io-performance: Rename files: exporter -> ex, importer -> im.
Ankit Meel
noreply at git.blender.org
Mon Jul 13 12:02:28 CEST 2020
Commit: 582bf4397cf69345e874f8202338b82acfd49eb1
Author: Ankit Meel
Date: Mon Jul 13 15:32:22 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB582bf4397cf69345e874f8202338b82acfd49eb1
Rename files: exporter -> ex, importer -> im.
Minor header cleanup.
===================================================================
M source/blender/io/wavefront_obj/CMakeLists.txt
R099 source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.cc
R094 source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.hh
R099 source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc
R096 source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.hh
R099 source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.cc source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mtl.cc
R094 source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.hh source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mtl.hh
R098 source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_nurbs.cc source/blender/io/wavefront_obj/intern/wavefront_obj_ex_nurbs.cc
R094 source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_nurbs.hh source/blender/io/wavefront_obj/intern/wavefront_obj_ex_nurbs.hh
M source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
R097 source/blender/io/wavefront_obj/intern/wavefront_obj_file_reader.cc source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.cc
R091 source/blender/io/wavefront_obj/intern/wavefront_obj_file_reader.hh source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.hh
R097 source/blender/io/wavefront_obj/intern/wavefront_obj_importer_mesh.cc source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.cc
R095 source/blender/io/wavefront_obj/intern/wavefront_obj_importer_mesh.hh source/blender/io/wavefront_obj/intern/wavefront_obj_im_mesh.hh
R097 source/blender/io/wavefront_obj/intern/wavefront_obj_importer_objects.cc source/blender/io/wavefront_obj/intern/wavefront_obj_im_objects.cc
R092 source/blender/io/wavefront_obj/intern/wavefront_obj_importer_objects.hh 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/CMakeLists.txt b/source/blender/io/wavefront_obj/CMakeLists.txt
index 13abcf5d62a..abb96c9d9fb 100644
--- a/source/blender/io/wavefront_obj/CMakeLists.txt
+++ b/source/blender/io/wavefront_obj/CMakeLists.txt
@@ -42,26 +42,26 @@ set(INC_SYS
set(SRC
intern/wavefront_obj.cc
intern/wavefront_obj_exporter.cc
- intern/wavefront_obj_exporter_mesh.cc
- intern/wavefront_obj_exporter_mtl.cc
- intern/wavefront_obj_exporter_nurbs.cc
- intern/wavefront_obj_file_handler.cc
- intern/wavefront_obj_file_reader.cc
+ intern/wavefront_obj_ex_mesh.cc
+ intern/wavefront_obj_ex_mtl.cc
+ intern/wavefront_obj_ex_nurbs.cc
+ intern/wavefront_obj_ex_file_writer.cc
+ intern/wavefront_obj_im_file_reader.cc
intern/wavefront_obj_importer.cc
- intern/wavefront_obj_importer_mesh.cc
- intern/wavefront_obj_importer_objects.cc
+ intern/wavefront_obj_im_mesh.cc
+ intern/wavefront_obj_im_objects.cc
IO_wavefront_obj.h
intern/wavefront_obj.hh
intern/wavefront_obj_exporter.hh
- intern/wavefront_obj_exporter_mesh.hh
- intern/wavefront_obj_exporter_mtl.hh
- intern/wavefront_obj_exporter_nurbs.hh
- intern/wavefront_obj_file_handler.hh
- intern/wavefront_obj_file_reader.hh
+ intern/wavefront_obj_ex_mesh.hh
+ intern/wavefront_obj_ex_mtl.hh
+ intern/wavefront_obj_ex_nurbs.hh
+ intern/wavefront_obj_ex_file_writer.hh
+ intern/wavefront_obj_im_file_reader.hh
intern/wavefront_obj_importer.hh
- intern/wavefront_obj_importer_mesh.hh
- intern/wavefront_obj_importer_objects.hh
+ intern/wavefront_obj_im_mesh.hh
+ intern/wavefront_obj_im_objects.hh
)
set(LIB
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.cc
similarity index 99%
rename from source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
rename to source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.cc
index 1a3a1e4030a..64a709171f3 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.cc
@@ -27,7 +27,7 @@
#include "DNA_object_types.h"
-#include "wavefront_obj_file_handler.hh"
+#include "wavefront_obj_ex_file_writer.hh"
namespace blender::io::obj {
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.hh
similarity index 94%
rename from source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh
rename to source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.hh
index ebdb12f94de..e4de61306f2 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_file_writer.hh
@@ -21,15 +21,13 @@
* \ingroup obj
*/
-#ifndef __WAVEFRONT_OBJ_FILE_HANDLER_HH__
-#define __WAVEFRONT_OBJ_FILE_HANDLER_HH__
-
-#include <stdio.h>
+#ifndef __WAVEFRONT_OBJ_EX_FILE_WRITER_HH__
+#define __WAVEFRONT_OBJ_EX_FILE_WRITER_HH__
#include "IO_wavefront_obj.h"
-#include "wavefront_obj_exporter_mesh.hh"
-#include "wavefront_obj_exporter_nurbs.hh"
+#include "wavefront_obj_ex_mesh.hh"
+#include "wavefront_obj_ex_nurbs.hh"
namespace blender::io::obj {
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc
similarity index 99%
rename from source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc
rename to source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc
index aebbe195178..e7ae4e2755d 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.cc
@@ -39,7 +39,7 @@
#include "DNA_material_types.h"
#include "DNA_modifier_types.h"
-#include "wavefront_obj_exporter_mesh.hh"
+#include "wavefront_obj_ex_mesh.hh"
namespace blender::io::obj {
/**
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.hh
similarity index 96%
rename from source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh
rename to source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.hh
index f5c426ad703..b2fe660b442 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mesh.hh
@@ -21,8 +21,8 @@
* \ingroup obj
*/
-#ifndef __WAVEFRONT_OBJ_EXPORTER_MESH_HH__
-#define __WAVEFRONT_OBJ_EXPORTER_MESH_HH__
+#ifndef __WAVEFRONT_OBJ_EX_MESH_HH__
+#define __WAVEFRONT_OBJ_EX_MESH_HH__
#include "BKE_lib_id.h"
#include "BKE_material.h"
@@ -113,4 +113,4 @@ class OBJMesh : NonMovable, NonCopyable {
};
} // namespace blender::io::obj
-#endif /* __WAVEFRONT_OBJ_HH__ */
+#endif
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mtl.cc
similarity index 99%
rename from source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.cc
rename to source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mtl.cc
index cfbe47f0109..8dee51951fa 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mtl.cc
@@ -31,7 +31,7 @@
#include "DNA_material_types.h"
#include "DNA_node_types.h"
-#include "wavefront_obj_exporter_mtl.hh"
+#include "wavefront_obj_ex_mtl.hh"
using namespace blender::bke;
namespace blender::io::obj {
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mtl.hh
similarity index 94%
rename from source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.hh
rename to source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mtl.hh
index 2e6467ef28b..797bc9e279a 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_mtl.hh
@@ -21,14 +21,14 @@
* \ingroup obj
*/
-#ifndef __WAVEFRONT_OBJ_EXPORTER_MTL_HH__
-#define __WAVEFRONT_OBJ_EXPORTER_MTL_HH__
+#ifndef __WAVEFRONT_OBJ_EX_MTL_HH__
+#define __WAVEFRONT_OBJ_EX_MTL_HH__
#include "BKE_node_tree_ref.hh"
#include "BLI_path_util.h"
-#include "wavefront_obj_exporter_mesh.hh"
+#include "wavefront_obj_ex_mesh.hh"
namespace blender::io::obj {
class MTLWriter {
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_nurbs.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_nurbs.cc
similarity index 98%
rename from source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_nurbs.cc
rename to source/blender/io/wavefront_obj/intern/wavefront_obj_ex_nurbs.cc
index d4c902e5784..9bfaa9b0b61 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_nurbs.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_nurbs.cc
@@ -27,7 +27,7 @@
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_query.h"
-#include "wavefront_obj_exporter_nurbs.hh"
+#include "wavefront_obj_ex_nurbs.hh"
namespace blender::io::obj {
/**
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_nurbs.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_nurbs.hh
similarity index 94%
rename from source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_nurbs.hh
rename to source/blender/io/wavefront_obj/intern/wavefront_obj_ex_nurbs.hh
index 74ffff30a31..837709619cf 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_nurbs.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_ex_nurbs.hh
@@ -21,8 +21,8 @@
* \ingroup obj
*/
-#ifndef __WAVEFRONT_OBJ_EXPORTER_NURBS_HH__
-#define __WAVEFRONT_OBJ_EXPORTER_NURBS_HH__
+#ifndef __WAVEFRONT_OBJ_EX_NURBS_HH__
+#define __WAVEFRONT_OBJ_EX_NURBS_HH__
#include "BKE_context.h"
#include "BKE_curve.h"
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
index 38f8df27441..e9fb3601934 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
@@ -34,11 +34,11 @@
#include "ED_object.h"
+#include "wavefront_obj_ex_file_writer.hh"
+#include "wavefront_obj_ex_mesh.hh"
+#include "wavefront_obj_ex_mtl.hh"
+#include "wavefront_obj_ex_nurbs.hh"
#include "wavefront_obj_exporter.hh"
-#include "wavefront_obj_exporter_mesh.hh"
-#include "wavefront_obj_exporter_mtl.hh"
-#include "wavefront_obj_exporter_nurbs.hh"
-#include "wavefront_obj_file_handler.hh"
namespace blender::io::obj {
/**
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_reader.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.cc
similarity index 97%
rename from source/blender/io/wavefront_obj/intern/wavefront_obj_file_reader.cc
rename to source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.cc
index 63775a9be1a..d45c680d9fe 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_reader.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.cc
@@ -29,8 +29,8 @@
#include "BLI_vector.hh"
#include "BLI_string_ref.hh"
-#include "wavefront_obj_file_reader.hh"
-#include "wavefront_obj_file_handler.hh"
+#include "wavefront_obj_im_file_reader.hh"
+#include "wavefront_obj_ex_file_writer.hh"
namespace blender::io::obj {
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_reader.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.hh
similarity index 91%
rename from source/blender/io/wavefront_obj/intern/wavefront_obj_file_reader.hh
rename to source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.hh
index 7c0f5fbb668..4d37385d25f 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_reader.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_im_file_reader.hh
@@ -21,11 +21,11 @@
* \ingroup obj
*/
-#ifn
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list