diff options
Diffstat (limited to 'source/blender/io/alembic/intern')
22 files changed, 44 insertions, 132 deletions
diff --git a/source/blender/io/alembic/intern/abc_axis_conversion.cc b/source/blender/io/alembic/intern/abc_axis_conversion.cc index 396c8fdb28b..23b24d2fd9a 100644 --- a/source/blender/io/alembic/intern/abc_axis_conversion.cc +++ b/source/blender/io/alembic/intern/abc_axis_conversion.cc @@ -25,9 +25,7 @@ #include "DNA_object_types.h" -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { void create_swapped_rotation_matrix(float rot_x_mat[3][3], float rot_y_mat[3][3], @@ -168,6 +166,4 @@ void create_transform_matrix(Object *obj, copy_m44_axis_swap(r_yup_mat, zup_mat, ABC_YUP_FROM_ZUP); } -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_axis_conversion.h b/source/blender/io/alembic/intern/abc_axis_conversion.h index 797592d9eee..30988222fb7 100644 --- a/source/blender/io/alembic/intern/abc_axis_conversion.h +++ b/source/blender/io/alembic/intern/abc_axis_conversion.h @@ -26,9 +26,7 @@ struct Object; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { /* TODO(kevin): for now keeping these transformations hardcoded to make sure * everything works properly, and also because Alembic is almost exclusively @@ -98,6 +96,4 @@ void create_transform_matrix(Object *obj, AbcMatrixMode mode, Object *proxy_from); -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_customdata.cc b/source/blender/io/alembic/intern/abc_customdata.cc index 408894a8de2..66e05504303 100644 --- a/source/blender/io/alembic/intern/abc_customdata.cc +++ b/source/blender/io/alembic/intern/abc_customdata.cc @@ -50,9 +50,7 @@ using Alembic::Abc::V2fArraySample; using Alembic::AbcGeom::OC4fGeomParam; using Alembic::AbcGeom::OV2fGeomParam; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { static void get_uvs(const CDStreamConfig &config, std::vector<Imath::V2f> &uvs, @@ -489,6 +487,4 @@ void read_custom_data(const std::string &iobject_full_name, } } -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_customdata.h b/source/blender/io/alembic/intern/abc_customdata.h index 8f4accb70dc..e98ec271b9f 100644 --- a/source/blender/io/alembic/intern/abc_customdata.h +++ b/source/blender/io/alembic/intern/abc_customdata.h @@ -36,9 +36,7 @@ struct Mesh; using Alembic::Abc::ICompoundProperty; using Alembic::Abc::OCompoundProperty; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { struct UVSample { std::vector<Imath::V2f> uvs; @@ -113,6 +111,4 @@ void read_custom_data(const std::string &iobject_full_name, const CDStreamConfig &config, const Alembic::Abc::ISampleSelector &iss); -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_reader_archive.cc b/source/blender/io/alembic/intern/abc_reader_archive.cc index 776b8955d47..4951dc0e035 100644 --- a/source/blender/io/alembic/intern/abc_reader_archive.cc +++ b/source/blender/io/alembic/intern/abc_reader_archive.cc @@ -39,9 +39,7 @@ using Alembic::Abc::Exception; using Alembic::Abc::IArchive; using Alembic::Abc::kWrapExisting; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { static IArchive open_archive(const std::string &filename, const std::vector<std::istream *> &input_streams) @@ -108,6 +106,4 @@ Alembic::Abc::IObject ArchiveReader::getTop() return m_archive.getTop(); } -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_reader_archive.h b/source/blender/io/alembic/intern/abc_reader_archive.h index aea62b46cce..2a4fd6bd8fb 100644 --- a/source/blender/io/alembic/intern/abc_reader_archive.h +++ b/source/blender/io/alembic/intern/abc_reader_archive.h @@ -30,9 +30,7 @@ struct Main; struct Scene; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { /* Wrappers around input and output archives. The goal is to be able to use * streams so that unicode paths work on Windows (T49112), and to make sure that @@ -52,6 +50,4 @@ class ArchiveReader { Alembic::Abc::IObject getTop(); }; -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_reader_camera.cc b/source/blender/io/alembic/intern/abc_reader_camera.cc index 3affb35908d..d7a096a4ed8 100644 --- a/source/blender/io/alembic/intern/abc_reader_camera.cc +++ b/source/blender/io/alembic/intern/abc_reader_camera.cc @@ -37,9 +37,7 @@ using Alembic::AbcGeom::IFloatProperty; using Alembic::AbcGeom::ISampleSelector; using Alembic::AbcGeom::kWrapExisting; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { AbcCameraReader::AbcCameraReader(const Alembic::Abc::IObject &object, ImportSettings &settings) : AbcObjectReader(object, settings) @@ -114,6 +112,4 @@ void AbcCameraReader::readObjectData(Main *bmain, const ISampleSelector &sample_ m_object->data = bcam; } -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_reader_camera.h b/source/blender/io/alembic/intern/abc_reader_camera.h index b733269407b..408e9623970 100644 --- a/source/blender/io/alembic/intern/abc_reader_camera.h +++ b/source/blender/io/alembic/intern/abc_reader_camera.h @@ -21,9 +21,7 @@ #include "abc_reader_object.h" -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { class AbcCameraReader : public AbcObjectReader { Alembic::AbcGeom::ICameraSchema m_schema; @@ -39,6 +37,4 @@ class AbcCameraReader : public AbcObjectReader { void readObjectData(Main *bmain, const Alembic::Abc::ISampleSelector &sample_sel); }; -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_reader_curves.cc b/source/blender/io/alembic/intern/abc_reader_curves.cc index a505dfd654b..e29b6eda6fc 100644 --- a/source/blender/io/alembic/intern/abc_reader_curves.cc +++ b/source/blender/io/alembic/intern/abc_reader_curves.cc @@ -54,9 +54,7 @@ using Alembic::AbcGeom::IInt16Property; using Alembic::AbcGeom::ISampleSelector; using Alembic::AbcGeom::kWrapExisting; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { AbcCurveReader::AbcCurveReader(const Alembic::Abc::IObject &object, ImportSettings &settings) : AbcObjectReader(object, settings) @@ -356,6 +354,4 @@ Mesh *AbcCurveReader::read_mesh(Mesh *existing_mesh, return BKE_mesh_new_nomain_from_curve(m_object); } -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_reader_curves.h b/source/blender/io/alembic/intern/abc_reader_curves.h index 7488adb9b24..075ed5ca6a1 100644 --- a/source/blender/io/alembic/intern/abc_reader_curves.h +++ b/source/blender/io/alembic/intern/abc_reader_curves.h @@ -29,9 +29,7 @@ struct Curve; #define ABC_CURVE_RESOLUTION_U_PROPNAME "blender:resolution" -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { class AbcCurveReader : public AbcObjectReader { Alembic::AbcGeom::ICurvesSchema m_curves_schema; @@ -55,6 +53,4 @@ class AbcCurveReader : public AbcObjectReader { const Alembic::Abc::ISampleSelector &sample_selector); }; -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_reader_mesh.cc b/source/blender/io/alembic/intern/abc_reader_mesh.cc index 98130eb28cd..5a42be2bb02 100644 --- a/source/blender/io/alembic/intern/abc_reader_mesh.cc +++ b/source/blender/io/alembic/intern/abc_reader_mesh.cc @@ -60,9 +60,7 @@ using Alembic::AbcGeom::N3fArraySamplePtr; using Alembic::AbcGeom::UInt32ArraySamplePtr; using Alembic::AbcGeom::V2fArraySamplePtr; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { /* NOTE: Alembic's polygon winding order is clockwise, to match with Renderman. */ @@ -936,6 +934,4 @@ Mesh *AbcSubDReader::read_mesh(Mesh *existing_mesh, return config.mesh; } -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_reader_mesh.h b/source/blender/io/alembic/intern/abc_reader_mesh.h index 363a74b8b5f..a29eeb71dff 100644 --- a/source/blender/io/alembic/intern/abc_reader_mesh.h +++ b/source/blender/io/alembic/intern/abc_reader_mesh.h @@ -24,9 +24,7 @@ struct Mesh; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { class AbcMeshReader : public AbcObjectReader { Alembic::AbcGeom::IPolyMeshSchema m_schema; @@ -85,6 +83,4 @@ void read_mverts(MVert *mverts, CDStreamConfig get_config(struct Mesh *mesh); -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_reader_nurbs.cc b/source/blender/io/alembic/intern/abc_reader_nurbs.cc index 3ca3f6229ab..27d4ec44a27 100644 --- a/source/blender/io/alembic/intern/abc_reader_nurbs.cc +++ b/source/blender/io/alembic/intern/abc_reader_nurbs.cc @@ -44,9 +44,7 @@ using Alembic::AbcGeom::INuPatch; using Alembic::AbcGeom::INuPatchSchema; using Alembic::AbcGeom::IObject; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { AbcNurbsReader::AbcNurbsReader(const IObject &object, ImportSettings &settings) : AbcObjectReader(object, settings) @@ -227,6 +225,4 @@ void AbcNurbsReader::getNurbsPatches(const IObject &obj) } } -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_reader_nurbs.h b/source/blender/io/alembic/intern/abc_reader_nurbs.h index 738da82885d..e8be2efba9f 100644 --- a/source/blender/io/alembic/intern/abc_reader_nurbs.h +++ b/source/blender/io/alembic/intern/abc_reader_nurbs.h @@ -21,9 +21,7 @@ #include "abc_reader_object.h" -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { class AbcNurbsReader : public AbcObjectReader { std::vector<std::pair<Alembic::AbcGeom::INuPatchSchema, Alembic::Abc::IObject>> m_schemas; @@ -39,6 +37,4 @@ class AbcNurbsReader : public AbcObjectReader { void getNurbsPatches(const Alembic::Abc::IObject &obj); }; -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_reader_object.cc b/source/blender/io/alembic/intern/abc_reader_object.cc index 06b0c07f4c5..1e832de1f47 100644 --- a/source/blender/io/alembic/intern/abc_reader_object.cc +++ b/source/blender/io/alembic/intern/abc_reader_object.cc @@ -41,9 +41,7 @@ using Alembic::AbcGeom::IObject; using Alembic::AbcGeom::IXform; using Alembic::AbcGeom::IXformSchema; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { AbcObjectReader::AbcObjectReader(const IObject &object, ImportSettings &settings) : m_name(""), @@ -335,6 +333,4 @@ void AbcObjectReader::decref() BLI_assert(m_refcount >= 0); } -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_reader_object.h b/source/blender/io/alembic/intern/abc_reader_object.h index 0bde60b06b5..8e00ed42777 100644 --- a/source/blender/io/alembic/intern/abc_reader_object.h +++ b/source/blender/io/alembic/intern/abc_reader_object.h @@ -31,9 +31,7 @@ struct Object; using Alembic::AbcCoreAbstract::chrono_t; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { struct ImportSettings { bool do_convert_mat; @@ -168,6 +166,4 @@ class AbcObjectReader { Imath::M44d get_matrix(const Alembic::AbcGeom::IXformSchema &schema, const float time); -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_reader_points.cc b/source/blender/io/alembic/intern/abc_reader_points.cc index b805da4daa3..f8cc6b0314a 100644 --- a/source/blender/io/alembic/intern/abc_reader_points.cc +++ b/source/blender/io/alembic/intern/abc_reader_points.cc @@ -43,9 +43,7 @@ using Alembic::AbcGeom::IPoints; using Alembic::AbcGeom::IPointsSchema; using Alembic::AbcGeom::ISampleSelector; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { AbcPointsReader::AbcPointsReader(const Alembic::Abc::IObject &object, ImportSettings &settings) : AbcObjectReader(object, settings) @@ -158,6 +156,4 @@ struct Mesh *AbcPointsReader::read_mesh(struct Mesh *existing_mesh, return new_mesh ? new_mesh : existing_mesh; } -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_reader_points.h b/source/blender/io/alembic/intern/abc_reader_points.h index 8a970ac35b3..aed66699c75 100644 --- a/source/blender/io/alembic/intern/abc_reader_points.h +++ b/source/blender/io/alembic/intern/abc_reader_points.h @@ -25,9 +25,7 @@ #include "abc_customdata.h" #include "abc_reader_object.h" -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { class AbcPointsReader : public AbcObjectReader { Alembic::AbcGeom::IPointsSchema m_schema; @@ -53,6 +51,4 @@ void read_points_sample(const Alembic::AbcGeom::IPointsSchema &schema, const Alembic::AbcGeom::ISampleSelector &selector, CDStreamConfig &config); -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_reader_transform.cc b/source/blender/io/alembic/intern/abc_reader_transform.cc index 456d1da2c68..3aab2f2d339 100644 --- a/source/blender/io/alembic/intern/abc_reader_transform.cc +++ b/source/blender/io/alembic/intern/abc_reader_transform.cc @@ -29,9 +29,7 @@ using Alembic::Abc::ISampleSelector; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { AbcEmptyReader::AbcEmptyReader(const Alembic::Abc::IObject &object, ImportSettings &settings) : AbcObjectReader(object, settings) @@ -77,6 +75,4 @@ void AbcEmptyReader::readObjectData(Main *bmain, const ISampleSelector &UNUSED(s m_object->data = NULL; } -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_reader_transform.h b/source/blender/io/alembic/intern/abc_reader_transform.h index 812d3bdfc92..e515560912f 100644 --- a/source/blender/io/alembic/intern/abc_reader_transform.h +++ b/source/blender/io/alembic/intern/abc_reader_transform.h @@ -23,9 +23,7 @@ #include <Alembic/AbcGeom/All.h> -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { class AbcEmptyReader : public AbcObjectReader { Alembic::AbcGeom::IXformSchema m_schema; @@ -41,6 +39,4 @@ class AbcEmptyReader : public AbcObjectReader { void readObjectData(Main *bmain, const Alembic::Abc::ISampleSelector &sample_sel); }; -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_util.cc b/source/blender/io/alembic/intern/abc_util.cc index 04febd7bfcb..edb20da89a5 100644 --- a/source/blender/io/alembic/intern/abc_util.cc +++ b/source/blender/io/alembic/intern/abc_util.cc @@ -38,9 +38,7 @@ #include "PIL_time.h" -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { std::string get_id_name(const Object *const ob) { @@ -261,6 +259,4 @@ std::ostream &operator<<(std::ostream &os, const SimpleLogger &logger) return os; } -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic diff --git a/source/blender/io/alembic/intern/abc_util.h b/source/blender/io/alembic/intern/abc_util.h index 4689173ab5f..98f4b0376a7 100644 --- a/source/blender/io/alembic/intern/abc_util.h +++ b/source/blender/io/alembic/intern/abc_util.h @@ -36,9 +36,7 @@ using Alembic::Abc::chrono_t; struct ID; struct Object; -namespace blender { -namespace io { -namespace alembic { +namespace blender::io::alembic { class AbcObjectReader; struct ImportSettings; @@ -161,6 +159,4 @@ class SimpleLogger { */ std::ostream &operator<<(std::ostream &os, const SimpleLogger &logger); -} // namespace alembic -} // namespace io -} // namespace blender +} // namespace blender::io::alembic |