[Bf-blender-cvs] [96d6571073d] soc-2020-io-performance: Move code to namespace blender; clang-format
Ankit Meel
noreply at git.blender.org
Sat Jun 27 15:23:51 CEST 2020
Commit: 96d6571073d3c8dde7f8ab2d40b31041e7a9be9a
Author: Ankit Meel
Date: Sat Jun 27 18:49:46 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB96d6571073d3c8dde7f8ab2d40b31041e7a9be9a
Move code to namespace blender; clang-format
===================================================================
M source/blender/editors/io/io_obj.c
M source/blender/io/wavefront_obj/intern/wavefront_obj.cc
M source/blender/io/wavefront_obj/intern/wavefront_obj.hh
M source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
M source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.hh
M source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc
M source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh
M source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.cc
M source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.hh
M source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_nurbs.cc
M source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_nurbs.hh
M source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
M source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh
M source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
M source/blender/io/wavefront_obj/intern/wavefront_obj_importer.hh
===================================================================
diff --git a/source/blender/editors/io/io_obj.c b/source/blender/editors/io/io_obj.c
index a09febfbfaa..eae0ed83412 100644
--- a/source/blender/editors/io/io_obj.c
+++ b/source/blender/editors/io/io_obj.c
@@ -280,12 +280,12 @@ void WM_OT_obj_export(struct wmOperatorType *ot)
RNA_def_boolean(ot->srna, "export_uv", true, "Export UVs", "Export UV coordinates");
RNA_def_boolean(
ot->srna, "export_normals", true, "Export normals", "Export per face per vertex normals");
- RNA_def_boolean(
- ot->srna,
- "export_materials",
- true,
- "Export Materials",
- "Export Materials and texture images' names collected from Principled BSDF and linked nodes of the object");
+ RNA_def_boolean(ot->srna,
+ "export_materials",
+ true,
+ "Export Materials",
+ "Export Materials and texture images' names collected from Principled BSDF and "
+ "linked nodes of the object");
RNA_def_boolean(
ot->srna,
"export_triangulated_mesh",
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj.cc
index 5e147e9aa98..3c7c9d067a7 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj.cc
@@ -37,7 +37,7 @@
void OBJ_export(bContext *C, const OBJExportParams *export_params)
{
double start_time = PIL_check_seconds_timer();
- io::obj::exporter_main(C, export_params);
+ blender::io::obj::exporter_main(C, export_params);
double end_time = PIL_check_seconds_timer();
std::cout << "\nOBJ export time: " << (end_time - start_time) * 1000 << " milliseconds\n";
}
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj.hh
index 2d045438fb9..2b05450240d 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj.hh
@@ -23,6 +23,7 @@
#include "IO_wavefront_obj.h"
+namespace blender {
namespace io {
namespace obj {
@@ -38,5 +39,6 @@ void OBJ_import(bContext *C, const OBJImportParams *import_params);
} // namespace obj
} // namespace io
+} // namespace blender
#endif /* __WAVEFRONT_OBJ_HH__ */
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 f1d1c8833f4..fb632f0b6bc 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
@@ -40,6 +40,7 @@
#include "wavefront_obj_exporter_nurbs.hh"
#include "wavefront_obj_file_handler.hh"
+namespace blender {
namespace io {
namespace obj {
@@ -173,3 +174,4 @@ void exporter_main(bContext *C, const OBJExportParams *export_params)
} // namespace obj
} // namespace io
+} // namespace blender
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.hh
index e7bf033f8b3..e026118ba68 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.hh
@@ -28,6 +28,7 @@
#include "IO_wavefront_obj.h"
+namespace blender {
namespace io {
namespace obj {
/**
@@ -37,4 +38,5 @@ void exporter_main(bContext *C, const OBJExportParams *export_params);
} // namespace obj
} // namespace io
+} // namespace blender
#endif
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc
index df40a56b486..c2c662b3f23 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.cc
@@ -38,6 +38,7 @@
#include "wavefront_obj_exporter_mesh.hh"
+namespace blender {
namespace io {
namespace obj {
@@ -262,3 +263,4 @@ void OBJMesh::calc_edge_vert_indices(uint r_vert_indices[2], uint edge_index)
} // namespace obj
} // namespace io
+} // namespace blender
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh
index aab14beca36..e5fcdcba549 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mesh.hh
@@ -34,6 +34,7 @@
#include "IO_wavefront_obj.h"
+namespace blender {
namespace io {
namespace obj {
/* -Y */
@@ -88,7 +89,8 @@ class OBJMesh {
}
/** Return active material of the object. */
- Material *export_object_material(){
+ Material *export_object_material()
+ {
return BKE_object_material_get(_export_object_eval, _export_object_eval->actcol);
}
/**
@@ -166,5 +168,6 @@ class OBJMesh {
};
} // namespace obj
} // namespace io
+} // namespace blender
#endif /* __WAVEFRONT_OBJ_HH__ */
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.cc
index c6894b07d49..0729d033a9f 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.cc
@@ -25,8 +25,8 @@
#include "BKE_node.h"
#include "BKE_node_tree_ref.hh"
-#include "BLI_math.h"
#include "BLI_map.hh"
+#include "BLI_math.h"
#include "DNA_material_types.h"
#include "DNA_node_types.h"
@@ -34,6 +34,7 @@
#include "wavefront_obj_exporter_mtl.hh"
using namespace BKE;
+namespace blender {
namespace io {
namespace obj {
@@ -237,7 +238,8 @@ void MTLWriter::append_material(OBJMesh &mesh_to_export)
blender::Vector<const OutputSocketRef *> linked_sockets;
for (auto const &map_type : texture_map_types.keys()) {
/* Find sockets linked to destination socket of interest in p-bsdf node. */
- linked_sockets_to_dest_id(&linked_sockets, _bsdf_node, node_tree, texture_map_types.lookup(map_type));
+ linked_sockets_to_dest_id(
+ &linked_sockets, _bsdf_node, node_tree, texture_map_types.lookup(map_type));
/* From the linked sockets, find Image Texture shader node. */
tex_node = linked_node_of_type(linked_sockets, SH_NODE_TEX_IMAGE);
tex_image_filepath = get_image_filepath(tex_node);
@@ -267,3 +269,4 @@ void MTLWriter::append_material(OBJMesh &mesh_to_export)
} // namespace obj
} // namespace io
+} // namespace blender
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.hh
index 3bb76a57581..dc3593a5dcd 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_mtl.hh
@@ -31,6 +31,7 @@
#include "wavefront_obj_exporter_mesh.hh"
+namespace blender {
namespace io {
namespace obj {
@@ -85,4 +86,5 @@ class MTLWriter {
} // namespace obj
} // namespace io
+} // namespace blender
#endif
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_nurbs.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_nurbs.cc
index 5deb437c626..7188de1f139 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_nurbs.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_nurbs.cc
@@ -29,6 +29,7 @@
#include "wavefront_obj_exporter_nurbs.hh"
+namespace blender {
namespace io {
namespace obj {
@@ -68,3 +69,4 @@ void OBJNurbs::get_curve_info(int *r_nurbs_degree, int *r_curv_num, Nurb *nurb)
} // namespace obj
} // namespace io
+} // namespace blender
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_nurbs.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_nurbs.hh
index b866983a60b..9da9c31681c 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_nurbs.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter_nurbs.hh
@@ -29,6 +29,7 @@
#include "DNA_curve_types.h"
+namespace blender {
namespace io {
namespace obj {
@@ -58,4 +59,5 @@ class OBJNurbs {
} // namespace obj
} // namespace io
+} // namespace blender
#endif
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
index 31218f0b01a..4e6c93df627 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
@@ -28,7 +28,7 @@
#include "DNA_object_types.h"
#include "wavefront_obj_file_handler.hh"
-
+namespace blender {
namespace io {
namespace obj {
@@ -297,3 +297,4 @@ void OBJWriter::update_index_offsets(OBJMesh &obj_mesh_data)
}
} // namespace obj
} // namespace io
+} // namespace blender
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh
index 473ad1b6618..8e5f0c9a89f 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.hh
@@ -31,6 +31,7 @@
#include "wavefront_obj_exporter_mesh.hh"
#include "wavefront_obj_exporter_nurbs.hh"
+namespace blender {
namespace io {
namespace obj {
@@ -113,4 +114,5 @@ class OBJWriter {
} // namespace obj
} // namespace io
+} // namespace blender
#endif
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 a7af7542f77..a0c26e3c497 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
@@ -24,9 +24,11 @@
#include "wavefront_obj_importer.hh"
#include "wavefront_obj_file_handler.hh"
+namespace blender {
namespace io {
namespace obj {
/* Currently not implemented. */
}
} // namespace io
+} // namespace blender
diff --git a/source/blender/io/w
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list