[Bf-blender-cvs] [670c103f107] soc-2020-io-performance: Move files to exporter and importer folder.

Ankit Meel noreply at git.blender.org
Tue Oct 6 20:45:23 CEST 2020


Commit: 670c103f107d6926f019c512894fee3ceb39098f
Author: Ankit Meel
Date:   Wed Oct 7 00:08:20 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB670c103f107d6926f019c512894fee3ceb39098f

Move files to exporter and importer folder.

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

M	source/blender/io/wavefront_obj/CMakeLists.txt
R100	source/blender/io/wavefront_obj/intern/wavefront_obj.cc	source/blender/io/wavefront_obj/IO_wavefront_obj.cc
R100	source/blender/io/wavefront_obj/intern/obj_export_file_writer.cc	source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
R100	source/blender/io/wavefront_obj/intern/obj_export_file_writer.hh	source/blender/io/wavefront_obj/exporter/obj_export_file_writer.hh
R100	source/blender/io/wavefront_obj/intern/obj_export_mesh.cc	source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
R100	source/blender/io/wavefront_obj/intern/obj_export_mesh.hh	source/blender/io/wavefront_obj/exporter/obj_export_mesh.hh
R100	source/blender/io/wavefront_obj/intern/obj_export_mtl.cc	source/blender/io/wavefront_obj/exporter/obj_export_mtl.cc
R100	source/blender/io/wavefront_obj/intern/obj_export_mtl.hh	source/blender/io/wavefront_obj/exporter/obj_export_mtl.hh
R100	source/blender/io/wavefront_obj/intern/obj_export_nurbs.cc	source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc
R100	source/blender/io/wavefront_obj/intern/obj_export_nurbs.hh	source/blender/io/wavefront_obj/exporter/obj_export_nurbs.hh
R100	source/blender/io/wavefront_obj/intern/obj_exporter.cc	source/blender/io/wavefront_obj/exporter/obj_exporter.cc
R100	source/blender/io/wavefront_obj/intern/obj_exporter.hh	source/blender/io/wavefront_obj/exporter/obj_exporter.hh
R100	source/blender/io/wavefront_obj/intern/importer_mesh_utils.cc	source/blender/io/wavefront_obj/importer/importer_mesh_utils.cc
R100	source/blender/io/wavefront_obj/intern/importer_mesh_utils.hh	source/blender/io/wavefront_obj/importer/importer_mesh_utils.hh
R100	source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc	source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc
R100	source/blender/io/wavefront_obj/intern/obj_import_file_reader.hh	source/blender/io/wavefront_obj/importer/obj_import_file_reader.hh
R100	source/blender/io/wavefront_obj/intern/obj_import_mesh.cc	source/blender/io/wavefront_obj/importer/obj_import_mesh.cc
R100	source/blender/io/wavefront_obj/intern/obj_import_mesh.hh	source/blender/io/wavefront_obj/importer/obj_import_mesh.hh
R100	source/blender/io/wavefront_obj/intern/obj_import_mtl.cc	source/blender/io/wavefront_obj/importer/obj_import_mtl.cc
R100	source/blender/io/wavefront_obj/intern/obj_import_mtl.hh	source/blender/io/wavefront_obj/importer/obj_import_mtl.hh
R100	source/blender/io/wavefront_obj/intern/obj_import_nurbs.cc	source/blender/io/wavefront_obj/importer/obj_import_nurbs.cc
R100	source/blender/io/wavefront_obj/intern/obj_import_nurbs.hh	source/blender/io/wavefront_obj/importer/obj_import_nurbs.hh
R100	source/blender/io/wavefront_obj/intern/obj_import_objects.cc	source/blender/io/wavefront_obj/importer/obj_import_objects.cc
R100	source/blender/io/wavefront_obj/intern/obj_import_objects.hh	source/blender/io/wavefront_obj/importer/obj_import_objects.hh
R100	source/blender/io/wavefront_obj/intern/obj_importer.cc	source/blender/io/wavefront_obj/importer/obj_importer.cc
R100	source/blender/io/wavefront_obj/intern/obj_importer.hh	source/blender/io/wavefront_obj/importer/obj_importer.hh
R100	source/blender/io/wavefront_obj/intern/parser_string_utils.cc	source/blender/io/wavefront_obj/importer/parser_string_utils.cc
R100	source/blender/io/wavefront_obj/intern/parser_string_utils.hh	source/blender/io/wavefront_obj/importer/parser_string_utils.hh

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

diff --git a/source/blender/io/wavefront_obj/CMakeLists.txt b/source/blender/io/wavefront_obj/CMakeLists.txt
index 184098a226c..b48ec67cf68 100644
--- a/source/blender/io/wavefront_obj/CMakeLists.txt
+++ b/source/blender/io/wavefront_obj/CMakeLists.txt
@@ -20,6 +20,8 @@
 
 set(INC
   .
+  ./exporter
+  ./importer
   ../../blenkernel
   ../../blenlib
   ../../bmesh
@@ -38,35 +40,35 @@ set(INC_SYS
 )
 
 set(SRC
-  intern/importer_mesh_utils.cc
-  intern/obj_exporter.cc
-  intern/obj_export_mesh.cc
-  intern/obj_export_mtl.cc
-  intern/obj_export_nurbs.cc
-  intern/obj_export_file_writer.cc
-  intern/obj_import_file_reader.cc
-  intern/obj_importer.cc
-  intern/obj_import_mesh.cc
-  intern/obj_import_mtl.cc
-  intern/obj_import_nurbs.cc
-  intern/obj_import_objects.cc
-  intern/parser_string_utils.cc
-  intern/wavefront_obj.cc
+  IO_wavefront_obj.cc
+  exporter/obj_exporter.cc
+  exporter/obj_export_mesh.cc
+  exporter/obj_export_mtl.cc
+  exporter/obj_export_nurbs.cc
+  exporter/obj_export_file_writer.cc
+  importer/importer_mesh_utils.cc
+  importer/obj_import_file_reader.cc
+  importer/obj_importer.cc
+  importer/obj_import_mesh.cc
+  importer/obj_import_mtl.cc
+  importer/obj_import_nurbs.cc
+  importer/obj_import_objects.cc
+  importer/parser_string_utils.cc
 
   IO_wavefront_obj.h
-  intern/importer_mesh_utils.hh
-  intern/obj_exporter.hh
-  intern/obj_export_mesh.hh
-  intern/obj_export_mtl.hh
-  intern/obj_export_nurbs.hh
-  intern/obj_export_file_writer.hh
-  intern/obj_import_file_reader.hh
-  intern/obj_importer.hh
-  intern/obj_import_mesh.hh
-  intern/obj_import_mtl.hh
-  intern/obj_import_nurbs.hh
-  intern/parser_string_utils.hh
-  intern/obj_import_objects.hh
+  exporter/obj_exporter.hh
+  exporter/obj_export_mesh.hh
+  exporter/obj_export_mtl.hh
+  exporter/obj_export_nurbs.hh
+  exporter/obj_export_file_writer.hh
+  importer/importer_mesh_utils.hh
+  importer/obj_import_file_reader.hh
+  importer/obj_importer.hh
+  importer/obj_import_mesh.hh
+  importer/obj_import_mtl.hh
+  importer/obj_import_nurbs.hh
+  importer/obj_import_objects.hh
+  importer/parser_string_utils.hh
 )
 
 set(LIB
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj.cc b/source/blender/io/wavefront_obj/IO_wavefront_obj.cc
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/wavefront_obj.cc
rename to source/blender/io/wavefront_obj/IO_wavefront_obj.cc
diff --git a/source/blender/io/wavefront_obj/intern/obj_export_file_writer.cc b/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_export_file_writer.cc
rename to source/blender/io/wavefront_obj/exporter/obj_export_file_writer.cc
diff --git a/source/blender/io/wavefront_obj/intern/obj_export_file_writer.hh b/source/blender/io/wavefront_obj/exporter/obj_export_file_writer.hh
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_export_file_writer.hh
rename to source/blender/io/wavefront_obj/exporter/obj_export_file_writer.hh
diff --git a/source/blender/io/wavefront_obj/intern/obj_export_mesh.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_export_mesh.cc
rename to source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
diff --git a/source/blender/io/wavefront_obj/intern/obj_export_mesh.hh b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.hh
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_export_mesh.hh
rename to source/blender/io/wavefront_obj/exporter/obj_export_mesh.hh
diff --git a/source/blender/io/wavefront_obj/intern/obj_export_mtl.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mtl.cc
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_export_mtl.cc
rename to source/blender/io/wavefront_obj/exporter/obj_export_mtl.cc
diff --git a/source/blender/io/wavefront_obj/intern/obj_export_mtl.hh b/source/blender/io/wavefront_obj/exporter/obj_export_mtl.hh
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_export_mtl.hh
rename to source/blender/io/wavefront_obj/exporter/obj_export_mtl.hh
diff --git a/source/blender/io/wavefront_obj/intern/obj_export_nurbs.cc b/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_export_nurbs.cc
rename to source/blender/io/wavefront_obj/exporter/obj_export_nurbs.cc
diff --git a/source/blender/io/wavefront_obj/intern/obj_export_nurbs.hh b/source/blender/io/wavefront_obj/exporter/obj_export_nurbs.hh
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_export_nurbs.hh
rename to source/blender/io/wavefront_obj/exporter/obj_export_nurbs.hh
diff --git a/source/blender/io/wavefront_obj/intern/obj_exporter.cc b/source/blender/io/wavefront_obj/exporter/obj_exporter.cc
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_exporter.cc
rename to source/blender/io/wavefront_obj/exporter/obj_exporter.cc
diff --git a/source/blender/io/wavefront_obj/intern/obj_exporter.hh b/source/blender/io/wavefront_obj/exporter/obj_exporter.hh
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_exporter.hh
rename to source/blender/io/wavefront_obj/exporter/obj_exporter.hh
diff --git a/source/blender/io/wavefront_obj/intern/importer_mesh_utils.cc b/source/blender/io/wavefront_obj/importer/importer_mesh_utils.cc
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/importer_mesh_utils.cc
rename to source/blender/io/wavefront_obj/importer/importer_mesh_utils.cc
diff --git a/source/blender/io/wavefront_obj/intern/importer_mesh_utils.hh b/source/blender/io/wavefront_obj/importer/importer_mesh_utils.hh
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/importer_mesh_utils.hh
rename to source/blender/io/wavefront_obj/importer/importer_mesh_utils.hh
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc b/source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_import_file_reader.cc
rename to source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_file_reader.hh b/source/blender/io/wavefront_obj/importer/obj_import_file_reader.hh
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_import_file_reader.hh
rename to source/blender/io/wavefront_obj/importer/obj_import_file_reader.hh
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_mesh.cc b/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_import_mesh.cc
rename to source/blender/io/wavefront_obj/importer/obj_import_mesh.cc
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_mesh.hh b/source/blender/io/wavefront_obj/importer/obj_import_mesh.hh
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_import_mesh.hh
rename to source/blender/io/wavefront_obj/importer/obj_import_mesh.hh
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_mtl.cc b/source/blender/io/wavefront_obj/importer/obj_import_mtl.cc
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_import_mtl.cc
rename to source/blender/io/wavefront_obj/importer/obj_import_mtl.cc
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_mtl.hh b/source/blender/io/wavefront_obj/importer/obj_import_mtl.hh
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_import_mtl.hh
rename to source/blender/io/wavefront_obj/importer/obj_import_mtl.hh
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_nurbs.cc b/source/blender/io/wavefront_obj/importer/obj_import_nurbs.cc
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_import_nurbs.cc
rename to source/blender/io/wavefront_obj/importer/obj_import_nurbs.cc
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_nurbs.hh b/source/blender/io/wavefront_obj/importer/obj_import_nurbs.hh
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_import_nurbs.hh
rename to source/blender/io/wavefront_obj/importer/obj_import_nurbs.hh
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_objects.cc b/source/blender/io/wavefront_obj/importer/obj_import_objects.cc
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_import_objects.cc
rename to source/blender/io/wavefront_obj/importer/obj_import_objects.cc
diff --git a/source/blender/io/wavefront_obj/intern/obj_import_objects.hh b/source/blender/io/wavefront_obj/importer/obj_import_objects.hh
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_import_objects.hh
rename to source/blender/io/wavefront_obj/importer/obj_import_objects.hh
diff --git a/source/blender/io/wavefront_obj/intern/obj_importer.cc b/source/blender/io/wavefront_obj/importer/obj_importer.cc
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_importer.cc
rename to source/blender/io/wavefront_obj/importer/obj_importer.cc
diff --git a/source/blender/io/wavefront_obj/intern/obj_importer.hh b/source/blender/io/wavefront_obj/importer/obj_importer.hh
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/obj_importer.hh
rename to source/blender/io/wavefront_obj/importer/obj_importer.hh
diff --git a/source/blender/io/wavefront_obj/intern/parser_string_utils.cc b/source/blender/io/wavefront_obj/importer/parser_string_utils.cc
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/parser_string_utils.cc
rename to source/blender/io/wavefront_obj/importer/parser_string_utils.cc
diff --git a/source/blender/io/wavefront_obj/intern/parser_string_utils.hh b/source/blender/io/wavefront_obj/importer/parser_string_utils.hh
similarity index 100%
rename from source/blender/io/wavefront_obj/intern/parser_string_utils.hh
rename to source/blender/io/wavefront_obj/importer/parser_string_utils.hh



More information about the Bf-blender-cvs mailing list