Commit: 549a00de6022f1cc24d9876ac35c902fdf81a2f3 Author: Sybren A. Stüvel Date: Tue Sep 8 16:57:58 2020 +0200 Branches: master https://developer.blender.org/rB549a00de6022f1cc24d9876ac35c902fdf81a2f3
Cleanup: Alembic, inline namespace declarations Replace nested `namespace blender { namespace io { namespace alembic {` with `namespace blender::io::alembic {`. No functional changes. =================================================================== M source/blender/io/alembic/exporter/abc_archive.cc M source/blender/io/alembic/exporter/abc_archive.h M source/blender/io/alembic/exporter/abc_export_capi.cc M source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc M source/blender/io/alembic/exporter/abc_hierarchy_iterator.h M source/blender/io/alembic/exporter/abc_subdiv_disabler.cc M source/blender/io/alembic/exporter/abc_subdiv_disabler.h M source/blender/io/alembic/exporter/abc_writer_abstract.cc M source/blender/io/alembic/exporter/abc_writer_abstract.h M source/blender/io/alembic/exporter/abc_writer_camera.cc M source/blender/io/alembic/exporter/abc_writer_camera.h M source/blender/io/alembic/exporter/abc_writer_curves.cc M source/blender/io/alembic/exporter/abc_writer_curves.h M source/blender/io/alembic/exporter/abc_writer_hair.cc M source/blender/io/alembic/exporter/abc_writer_hair.h M source/blender/io/alembic/exporter/abc_writer_instance.cc M source/blender/io/alembic/exporter/abc_writer_instance.h M source/blender/io/alembic/exporter/abc_writer_mball.cc M source/blender/io/alembic/exporter/abc_writer_mball.h M source/blender/io/alembic/exporter/abc_writer_mesh.cc M source/blender/io/alembic/exporter/abc_writer_mesh.h M source/blender/io/alembic/exporter/abc_writer_nurbs.cc M source/blender/io/alembic/exporter/abc_writer_nurbs.h M source/blender/io/alembic/exporter/abc_writer_points.cc M source/blender/io/alembic/exporter/abc_writer_points.h M source/blender/io/alembic/exporter/abc_writer_transform.cc M source/blender/io/alembic/exporter/abc_writer_transform.h M source/blender/io/alembic/intern/abc_axis_conversion.cc M source/blender/io/alembic/intern/abc_axis_conversion.h M source/blender/io/alembic/intern/abc_customdata.cc M source/blender/io/alembic/intern/abc_customdata.h M source/blender/io/alembic/intern/abc_reader_archive.cc M source/blender/io/alembic/intern/abc_reader_archive.h M source/blender/io/alembic/intern/abc_reader_camera.cc M source/blender/io/alembic/intern/abc_reader_camera.h M source/blender/io/alembic/intern/abc_reader_curves.cc M source/blender/io/alembic/intern/abc_reader_curves.h M source/blender/io/alembic/intern/abc_reader_mesh.cc M source/blender/io/alembic/intern/abc_reader_mesh.h M source/blender/io/alembic/intern/abc_reader_nurbs.cc M source/blender/io/alembic/intern/abc_reader_nurbs.h M source/blender/io/alembic/intern/abc_reader_object.cc M source/blender/io/alembic/intern/abc_reader_object.h M source/blender/io/alembic/intern/abc_reader_points.cc M source/blender/io/alembic/intern/abc_reader_points.h M source/blender/io/alembic/intern/abc_reader_transform.cc M source/blender/io/alembic/intern/abc_reader_transform.h M source/blender/io/alembic/intern/abc_util.cc M source/blender/io/alembic/intern/abc_util.h M source/blender/io/alembic/tests/abc_export_test.cc M source/blender/io/alembic/tests/abc_matrix_test.cc =================================================================== diff --git a/source/blender/io/alembic/exporter/abc_archive.cc b/source/blender/io/alembic/exporter/abc_archive.cc index 5fbf74f0705..a181a721de9 100644 --- a/source/blender/io/alembic/exporter/abc_archive.cc +++ b/source/blender/io/alembic/exporter/abc_archive.cc @@ -37,9 +37,7 @@ # include "utfconv.h" #endif -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { using Alembic::Abc::ErrorHandler; using Alembic::Abc::kWrapExisting; @@ -260,6 +258,4 @@ void ABCArchive::update_bounding_box(const Imath::Box3d &bounds) abc_archive_bbox_.set(bounds); } -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/exporter/abc_archive.h b/source/blender/io/alembic/exporter/abc_archive.h index 43d0acf2520..8e6e5e40663 100644 --- a/source/blender/io/alembic/exporter/abc_archive.h +++ b/source/blender/io/alembic/exporter/abc_archive.h @@ -36,9 +36,7 @@ struct Main; struct Scene; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { /* Container for an Alembic archive and time sampling info. * @@ -82,6 +80,4 @@ class ABCArchive { Alembic::Abc::OBox3dProperty abc_archive_bbox_; }; -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/exporter/abc_export_capi.cc b/source/blender/io/alembic/exporter/abc_export_capi.cc index 6412379c126..c22864a5433 100644 --- a/source/blender/io/alembic/exporter/abc_export_capi.cc +++ b/source/blender/io/alembic/exporter/abc_export_capi.cc @@ -62,9 +62,7 @@ struct ExportJobData { bool export_ok; }; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { // Construct the depsgraph for exporting. static void build_depsgraph(Depsgraph *depsgraph, const bool visible_objects_only) @@ -197,9 +195,7 @@ static void export_endjob(void *customdata) WM_set_locked_interface(data->wm, false); } -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic bool ABC_export(Scene *scene, bContext *C, diff --git a/source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc b/source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc index 4cb6ca0c601..e2be241c144 100644 --- a/source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc +++ b/source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc @@ -40,9 +40,7 @@ #include "DNA_layer_types.h" #include "DNA_object_types.h" -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { ABCHierarchyIterator::ABCHierarchyIterator(Depsgraph *depsgraph, ABCArchive *abc_archive, @@ -275,6 +273,4 @@ AbstractHierarchyWriter *ABCHierarchyIterator::create_particle_writer( return particle_writer.release(); } -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/exporter/abc_hierarchy_iterator.h b/source/blender/io/alembic/exporter/abc_hierarchy_iterator.h index 5bc82564cdb..a0d9257b822 100644 --- a/source/blender/io/alembic/exporter/abc_hierarchy_iterator.h +++ b/source/blender/io/alembic/exporter/abc_hierarchy_iterator.h @@ -32,9 +32,7 @@ struct Depsgraph; struct ID; struct Object; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { class ABCAbstractWriter; class ABCHierarchyIterator; @@ -93,6 +91,4 @@ class ABCHierarchyIterator : public AbstractHierarchyIterator { const HierarchyContext *context, const ABCWriterConstructorArgs &writer_args); }; -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/exporter/abc_subdiv_disabler.cc b/source/blender/io/alembic/exporter/abc_subdiv_disabler.cc index 7c147076975..255803a6bfb 100644 --- a/source/blender/io/alembic/exporter/abc_subdiv_disabler.cc +++ b/source/blender/io/alembic/exporter/abc_subdiv_disabler.cc @@ -32,9 +32,7 @@ #include "BKE_modifier.h" -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { SubdivModifierDisabler::SubdivModifierDisabler(Depsgraph *depsgraph) : depsgraph_(depsgraph) { @@ -102,6 +100,4 @@ ModifierData *SubdivModifierDisabler::get_subdiv_modifier(Scene *scene, Object * return nullptr; } -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/exporter/abc_subdiv_disabler.h b/source/blender/io/alembic/exporter/abc_subdiv_disabler.h index 677847f3f63..3556df7ff31 100644 --- a/source/blender/io/alembic/exporter/abc_subdiv_disabler.h +++ b/source/blender/io/alembic/exporter/abc_subdiv_disabler.h @@ -25,9 +25,7 @@ struct ModifierData; struct Object; struct Scene; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { /** * Temporarily all subdivision modifiers on mesh objects. @@ -50,6 +48,4 @@ class SubdivModifierDisabler final { static ModifierData *get_subdiv_modifier(Scene *scene, Object *ob); }; -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/exporter/abc_writer_abstract.cc b/source/blender/io/alembic/exporter/abc_writer_abstract.cc index 84527a12e85..0b08d8c4e58 100644 --- a/source/blender/io/alembic/exporter/abc_writer_abstract.cc +++ b/source/blender/io/alembic/exporter/abc_writer_abstract.cc @@ -32,9 +32,7 @@ #include "CLG_log.h" static CLG_LogRef LOG = {"io.alembic"}; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { using Alembic::Abc::OObject; using Alembic::Abc::TimeSamplingPtr; @@ -112,6 +110,4 @@ void ABCAbstractWriter::write_visibility(const HierarchyContext &context) Alembic::AbcGeom::kVisibilityHidden); } -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/exporter/abc_writer_abstract.h b/source/blender/io/alembic/exporter/abc_writer_abstract.h index fefa9c356f2..59c55330443 100644 --- a/source/blender/io/alembic/exporter/abc_writer_abstract.h +++ b/source/blender/io/alembic/exporter/abc_writer_abstract.h @@ -30,9 +30,7 @@ struct Material; struct Object; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { class ABCAbstractWriter : public AbstractHierarchyWriter { protected: @@ -77,6 +75,4 @@ class ABCAbstractWriter : public AbstractHierarchyWriter { void write_visibility(const HierarchyContext &context); }; -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/exporter/abc_writer_camera.cc b/source/blender/io/alembic/exporter/abc_writer_camera.cc index 6f13f791c4e..0ce6c3dc07f 100644 --- a/source/blender/io/alembic/exporter/abc_writer_camera.cc +++ b/source/blender/io/alembic/exporter/abc_writer_camera.cc @@ -31,9 +31,7 @@ #include "CLG_log.h" static CLG_LogRef LOG = {"io.alembic"}; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { using Alembic::AbcGeom::CameraSample; using Alembic::AbcGeom::OCamera; @@ -105,6 +103,4 @@ void ABCCameraWriter::do_write(HierarchyContext &context) abc_camera_schema_.set(camera_sample); } -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/exporter/abc_writer_camera.h b/source/blender/io/alembic/exporter/abc_writer_camera.h index ceaa352d162..1b3e5898517 100644 --- a/source/blender/io/alembic/exporter/abc_writer_camera.h +++ b/source/blender/io/alembic/exporter/abc_writer_camera.h @@ -23,9 +23,7 @@ #include <Alembic/AbcGeom/OCamera.h> -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { class ABCCameraWriter : public ABCAbstractWriter { private: @@ -47,6 +45,4 @@ class ABCCameraWriter : public ABCAbstractWriter { virtual void do_write(HierarchyContext &context) override; }; -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/exporter/abc_writer_curves.cc b/source/blender/io/alembic/exporter/abc_writer_curves.cc index 9d65830c699..6a12e4c59f3 100644 --- a/source/blender/io/alembic/exporter/abc_writer_curves.cc +++ b/source/blender/io/alembic/exporter/abc_writer_curves.cc @@ -41,9 +41,7 @@ using Alembic::AbcGeom::OInt16Property; using Alembic::AbcGeom::ON3fGeomParam; using Alembic::AbcGeom::OV2fGeomParam; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { const std::string ABC_CURVE_RESOLUTION_U_PROPNAME("blender:resolution"); @@ -196,6 +194,4 @@ Mesh *ABCCurveMeshWriter::get_export_mesh(Object *object_eval, bool &r_needsfree return BKE_mesh_new_nomain_from_curve(object_eval); } -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/exporter/abc_writer_curves.h b/source/blender/io/alembic/exporter/abc_writer_curves.h index cd6621c398d..d15f008f947 100644 --- a/source/blender/io/alembic/exporter/abc_writer_curves.h +++ b/source/blender/io/alembic/exporter/abc_writer_curves.h @@ -27,9 +27,7 @@ #include <Alembic/AbcGeom/OCurves.h> -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { extern const std::string ABC_CURVE_RESOLUTION_U_PROPNAME; @@ -56,6 +54,4 @@ class ABCCurveMeshWriter : public ABCGenericMeshWriter { virtual Mesh *get_export_mesh(Object *object_eval, bool &r_needsfree) override; }; -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/exporter/abc_writer_ha @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs