[Bf-blender-cvs] [02c7cf5322d] soc-2020-io-performance: Namespace in lower case; rename dummy UI settings
Ankit Meel
noreply at git.blender.org
Sat Jun 6 14:54:20 CEST 2020
Commit: 02c7cf5322dc77e13492d86ecba1213f523a7754
Author: Ankit Meel
Date: Sat Jun 6 15:40:51 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB02c7cf5322dc77e13492d86ecba1213f523a7754
Namespace in lower case; rename dummy UI settings
Since capitalised namespaces could cause confusion with classes, they
are changed to lower case, in uniformity with the rest of the code.
Also, in some old settings in exporter file selector are renamed to
show that they do nothing. As William Reynish suggested on devtalk
feedback thread, at some point, it'd be good to have them drawn with
python panels. [1]
[1]: devtalk.blender.org/t/13528/2
===================================================================
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_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 1989913f9e0..72c25315921 100644
--- a/source/blender/editors/io/io_obj.c
+++ b/source/blender/editors/io/io_obj.c
@@ -46,8 +46,8 @@
#include "DEG_depsgraph.h"
-#include "io_obj.h"
#include "IO_wavefront_obj.h"
+#include "io_obj.h"
static int wm_obj_export_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
@@ -95,10 +95,10 @@ static void ui_obj_export_settings(uiLayout *layout, PointerRNA *imfptr)
uiItemL(row, IFACE_("Some Options"), ICON_NONE);
row = uiLayoutRow(box, false);
- uiItemR(row, imfptr, "print_name", 0, NULL, ICON_NONE);
+ uiItemR(row, imfptr, "dummy_checkbox", 0, NULL, ICON_NONE);
row = uiLayoutRow(box, false);
- uiItemR(row, imfptr, "print_the_float", 0, NULL, ICON_NONE);
+ uiItemR(row, imfptr, "dummy_slider", 0, NULL, ICON_NONE);
}
static void wm_obj_export_draw(bContext *UNUSED(C), wmOperator *op)
@@ -127,14 +127,14 @@ void WM_OT_obj_export(struct wmOperatorType *ot)
FILE_DEFAULTDISPLAY,
FILE_SORT_ALPHA);
- RNA_def_boolean(ot->srna, "print_name", 0, "Print Name?", "If enabled, prints name of OP");
+ RNA_def_boolean(ot->srna, "dummy_checkbox", 0, "Dummy Checkbox", "");
RNA_def_float(ot->srna,
- "print_the_float",
+ "dummy_slider",
4.56,
0.0f,
10.0f,
- "Print the Float",
- "Prints the given Float",
+ "Dummy Slider",
+ "",
1.0f,
9.0f);
}
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj.cc
index c291a4d5777..25f56582e68 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj.cc
@@ -32,7 +32,7 @@
*/
void OBJ_export(bContext *C, const OBJExportParams *export_params)
{
- IO::OBJ::exporter_main(C, export_params);
+ io::obj::exporter_main(C, export_params);
}
/**
* Called from io_obj.c. Currently not implemented.
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj.hh
index 6e1151383f3..da1ae3ad884 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj.hh
@@ -27,8 +27,8 @@
#include "BLI_vector.hh"
#include "DNA_meshdata_types.h"
-namespace IO {
-namespace OBJ {
+namespace io {
+namespace obj {
/**
* Polygon stores the data of one face of the mesh.
@@ -63,11 +63,11 @@ struct OBJ_data_to_export {
uint tot_vertices;
/** Polygons in a mesh to export. */
- BLI::Vector<IO::OBJ::Polygon> polygon_list;
+ BLI::Vector<io::obj::Polygon> polygon_list;
/** Number of polygons in a mesh to export. */
uint tot_faces;
};
-} // namespace OBJ
-} // namespace IO
+} // namespace obj
+} // namespace io
#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 1485592fd34..d304cd83e89 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
@@ -48,8 +48,8 @@
#include "wavefront_obj_exporter.hh"
#include "wavefront_obj_file_handler.hh"
-namespace IO {
-namespace OBJ {
+namespace io {
+namespace obj {
/**
* Store the mesh vertex coordinates in data_to_export, in world coordinates.
@@ -136,8 +136,8 @@ void exporter_main(bContext *C, const OBJExportParams *export_params)
get_geometry_per_object(export_params, &data_to_export);
- IO::OBJ::write_obj_data(filepath, &data_to_export);
+ io::obj::write_obj_data(filepath, &data_to_export);
MEM_freeN(data_to_export.mvert);
}
-} // namespace OBJ
-} // namespace IO
+} // namespace obj
+} // namespace io
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 9e717905424..2666a0a4e8c 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.hh
@@ -26,14 +26,14 @@
#include "wavefront_obj.hh"
-namespace IO {
-namespace OBJ {
+namespace io {
+namespace obj {
/**
* Central internal function to call data preparation & writer functions.
* Recieves export_settings from obj.cc.
*/
void exporter_main(bContext *C, const OBJExportParams *export_params);
-} // namespace OBJ
-} // namespace IO
+} // namespace obj
+} // namespace io
#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 50e11c3bd9a..3f12d9eb8e3 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
@@ -27,8 +27,9 @@
#include "wavefront_obj.hh"
#include "wavefront_obj_file_handler.hh"
-namespace IO {
-namespace OBJ {
+namespace io {
+namespace obj {
+
/**
* File writer to the OBJ file at filepath.
* data_to_export is filled in obj_exporter.cc.
@@ -63,5 +64,5 @@ void write_obj_data(const char *filepath, OBJ_data_to_export *data_to_export)
}
}
-} // namespace OBJ
-} // namespace IO
+} // namespace obj
+} // namespace io
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 41ac2e9b7df..011e81c165f 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
@@ -25,14 +25,14 @@
#include "wavefront_obj.hh"
-namespace IO {
-namespace OBJ {
+namespace io {
+namespace obj {
/**
* Low level writer to the OBJ file at filepath.
* data_to_export is filled in obj_exporter.cc.
*/
-void write_obj_data(const char *filepath, IO::OBJ::OBJ_data_to_export *data_to_export);
+void write_obj_data(const char *filepath, io::obj::OBJ_data_to_export *data_to_export);
-} // namespace OBJ
-} // namespace IO
+} // namespace obj
+} // namespace io
#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 8a6ae51a360..a7af7542f77 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
@@ -21,11 +21,12 @@
* \ingroup obj
*/
-#include "wavefront_obj_file_handler.hh"
#include "wavefront_obj_importer.hh"
+#include "wavefront_obj_file_handler.hh"
+
+namespace io {
+namespace obj {
+/* Currently not implemented. */
-namespace IO {
-namespace OBJ {
- /* Currently not implemented. */
}
-} // namespace IO
+} // namespace io
diff --git a/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.hh b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.hh
index 5e99a3faed4..f39b4c991a0 100644
--- a/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.hh
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.hh
@@ -24,10 +24,11 @@
#ifndef __WAVEFRONT_OBJ_IMPORTER_HH__
#define __WAVEFRONT_OBJ_IMPORTER_HH__
-namespace IO {
-namespace OBJ {
- /* Currently not implemented. */
+namespace io {
+namespace obj {
+/* Currently not implemented. */
+
}
-} // namespace IO
+} // namespace io
#endif
More information about the Bf-blender-cvs
mailing list