diff options
Diffstat (limited to 'source/blender/io/usd/intern')
18 files changed, 36 insertions, 108 deletions
diff --git a/source/blender/io/usd/intern/usd_capi.cc b/source/blender/io/usd/intern/usd_capi.cc index 52075728e3e..4717f27dbd9 100644 --- a/source/blender/io/usd/intern/usd_capi.cc +++ b/source/blender/io/usd/intern/usd_capi.cc @@ -46,9 +46,7 @@ #include "WM_api.h" #include "WM_types.h" -namespace blender { -namespace io { -namespace usd { +namespace blender::io::usd { struct ExportJobData { Main *bmain; @@ -185,9 +183,7 @@ static void export_endjob(void *customdata) WM_set_locked_interface(data->wm, false); } -} // namespace usd -} // namespace io -} // namespace blender +} // namespace blender::io::usd bool USD_export(bContext *C, const char *filepath, diff --git a/source/blender/io/usd/intern/usd_exporter_context.h b/source/blender/io/usd/intern/usd_exporter_context.h index 5513768b527..41ff34b327e 100644 --- a/source/blender/io/usd/intern/usd_exporter_context.h +++ b/source/blender/io/usd/intern/usd_exporter_context.h @@ -26,9 +26,7 @@ struct Depsgraph; struct Object; -namespace blender { -namespace io { -namespace usd { +namespace blender::io::usd { class USDHierarchyIterator; @@ -40,6 +38,4 @@ struct USDExporterContext { const USDExportParams &export_params; }; -} // namespace usd -} // namespace io -} // namespace blender +} // namespace blender::io::usd diff --git a/source/blender/io/usd/intern/usd_hierarchy_iterator.cc b/source/blender/io/usd/intern/usd_hierarchy_iterator.cc index 39fbef70e81..66dfc21441e 100644 --- a/source/blender/io/usd/intern/usd_hierarchy_iterator.cc +++ b/source/blender/io/usd/intern/usd_hierarchy_iterator.cc @@ -42,9 +42,7 @@ #include "DNA_layer_types.h" #include "DNA_object_types.h" -namespace blender { -namespace io { -namespace usd { +namespace blender::io::usd { USDHierarchyIterator::USDHierarchyIterator(Depsgraph *depsgraph, pxr::UsdStageRefPtr stage, @@ -149,6 +147,4 @@ AbstractHierarchyWriter *USDHierarchyIterator::create_particle_writer( return nullptr; } -} // namespace usd -} // namespace io -} // namespace blender +} // namespace blender::io::usd diff --git a/source/blender/io/usd/intern/usd_hierarchy_iterator.h b/source/blender/io/usd/intern/usd_hierarchy_iterator.h index 03e80ce735a..922ab761bd9 100644 --- a/source/blender/io/usd/intern/usd_hierarchy_iterator.h +++ b/source/blender/io/usd/intern/usd_hierarchy_iterator.h @@ -31,9 +31,7 @@ struct Depsgraph; struct ID; struct Object; -namespace blender { -namespace io { -namespace usd { +namespace blender::io::usd { using blender::io::AbstractHierarchyIterator; using blender::io::AbstractHierarchyWriter; @@ -71,6 +69,4 @@ class USDHierarchyIterator : public AbstractHierarchyIterator { USDExporterContext create_usd_export_context(const HierarchyContext *context); }; -} // namespace usd -} // namespace io -} // namespace blender +} // namespace blender::io::usd diff --git a/source/blender/io/usd/intern/usd_writer_abstract.cc b/source/blender/io/usd/intern/usd_writer_abstract.cc index 0edfbc62d6b..3f5babdee56 100644 --- a/source/blender/io/usd/intern/usd_writer_abstract.cc +++ b/source/blender/io/usd/intern/usd_writer_abstract.cc @@ -34,9 +34,7 @@ static const pxr::TfToken roughness("roughness", pxr::TfToken::Immortal); static const pxr::TfToken surface("surface", pxr::TfToken::Immortal); } // namespace usdtokens -namespace blender { -namespace io { -namespace usd { +namespace blender::io::usd { USDAbstractWriter::USDAbstractWriter(const USDExporterContext &usd_export_context) : usd_export_context_(usd_export_context), @@ -155,6 +153,4 @@ bool USDAbstractWriter::mark_as_instance(const HierarchyContext &context, const return true; } -} // namespace usd -} // namespace io -} // namespace blender +} // namespace blender::io::usd diff --git a/source/blender/io/usd/intern/usd_writer_abstract.h b/source/blender/io/usd/intern/usd_writer_abstract.h index 6cf7c79c5fa..6a3b8d515dc 100644 --- a/source/blender/io/usd/intern/usd_writer_abstract.h +++ b/source/blender/io/usd/intern/usd_writer_abstract.h @@ -35,9 +35,7 @@ struct Material; struct Object; -namespace blender { -namespace io { -namespace usd { +namespace blender::io::usd { using blender::io::AbstractHierarchyWriter; using blender::io::HierarchyContext; @@ -82,6 +80,4 @@ class USDAbstractWriter : public AbstractHierarchyWriter { virtual bool mark_as_instance(const HierarchyContext &context, const pxr::UsdPrim &prim); }; -} // namespace usd -} // namespace io -} // namespace blender +} // namespace blender::io::usd diff --git a/source/blender/io/usd/intern/usd_writer_camera.cc b/source/blender/io/usd/intern/usd_writer_camera.cc index d51eb32d3fd..f21a0444888 100644 --- a/source/blender/io/usd/intern/usd_writer_camera.cc +++ b/source/blender/io/usd/intern/usd_writer_camera.cc @@ -28,9 +28,7 @@ #include "DNA_camera_types.h" #include "DNA_scene_types.h" -namespace blender { -namespace io { -namespace usd { +namespace blender::io::usd { USDCameraWriter::USDCameraWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) { @@ -108,6 +106,4 @@ void USDCameraWriter::do_write(HierarchyContext &context) } } -} // namespace usd -} // namespace io -} // namespace blender +} // namespace blender::io::usd diff --git a/source/blender/io/usd/intern/usd_writer_camera.h b/source/blender/io/usd/intern/usd_writer_camera.h index 1c613d7879b..f6d7e777f2f 100644 --- a/source/blender/io/usd/intern/usd_writer_camera.h +++ b/source/blender/io/usd/intern/usd_writer_camera.h @@ -20,9 +20,7 @@ #include "usd_writer_abstract.h" -namespace blender { -namespace io { -namespace usd { +namespace blender::io::usd { /* Writer for writing camera data to UsdGeomCamera. */ class USDCameraWriter : public USDAbstractWriter { @@ -34,6 +32,4 @@ class USDCameraWriter : public USDAbstractWriter { virtual void do_write(HierarchyContext &context) override; }; -} // namespace usd -} // namespace io -} // namespace blender +} // namespace blender::io::usd diff --git a/source/blender/io/usd/intern/usd_writer_hair.cc b/source/blender/io/usd/intern/usd_writer_hair.cc index 0fd5c4ce727..df09aa2f187 100644 --- a/source/blender/io/usd/intern/usd_writer_hair.cc +++ b/source/blender/io/usd/intern/usd_writer_hair.cc @@ -26,9 +26,7 @@ #include "DNA_particle_types.h" -namespace blender { -namespace io { -namespace usd { +namespace blender::io::usd { USDHairWriter::USDHairWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) { @@ -87,6 +85,4 @@ bool USDHairWriter::check_is_animated(const HierarchyContext &UNUSED(context)) c return true; } -} // namespace usd -} // namespace io -} // namespace blender +} // namespace blender::io::usd diff --git a/source/blender/io/usd/intern/usd_writer_hair.h b/source/blender/io/usd/intern/usd_writer_hair.h index b9a28013875..8dc256fdb8e 100644 --- a/source/blender/io/usd/intern/usd_writer_hair.h +++ b/source/blender/io/usd/intern/usd_writer_hair.h @@ -20,9 +20,7 @@ #include "usd_writer_abstract.h" -namespace blender { -namespace io { -namespace usd { +namespace blender::io::usd { /* Writer for writing hair particle data as USD curves. */ class USDHairWriter : public USDAbstractWriter { @@ -34,6 +32,4 @@ class USDHairWriter : public USDAbstractWriter { virtual bool check_is_animated(const HierarchyContext &context) const override; }; -} // namespace usd -} // namespace io -} // namespace blender +} // namespace blender::io::usd diff --git a/source/blender/io/usd/intern/usd_writer_light.cc b/source/blender/io/usd/intern/usd_writer_light.cc index 19115dd1a4e..b6a81c973d2 100644 --- a/source/blender/io/usd/intern/usd_writer_light.cc +++ b/source/blender/io/usd/intern/usd_writer_light.cc @@ -30,9 +30,7 @@ #include "DNA_light_types.h" #include "DNA_object_types.h" -namespace blender { -namespace io { -namespace usd { +namespace blender::io::usd { USDLightWriter::USDLightWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) { @@ -109,6 +107,4 @@ void USDLightWriter::do_write(HierarchyContext &context) usd_light.CreateSpecularAttr().Set(light->spec_fac, timecode); } -} // namespace usd -} // namespace io -} // namespace blender +} // namespace blender::io::usd diff --git a/source/blender/io/usd/intern/usd_writer_light.h b/source/blender/io/usd/intern/usd_writer_light.h index 082050ad071..9be82bfe214 100644 --- a/source/blender/io/usd/intern/usd_writer_light.h +++ b/source/blender/io/usd/intern/usd_writer_light.h @@ -20,9 +20,7 @@ #include "usd_writer_abstract.h" -namespace blender { -namespace io { -namespace usd { +namespace blender::io::usd { class USDLightWriter : public USDAbstractWriter { public: @@ -33,6 +31,4 @@ class USDLightWriter : public USDAbstractWriter { virtual void do_write(HierarchyContext &context) override; }; -} // namespace usd -} // namespace io -} // namespace blender +} // namespace blender::io::usd diff --git a/source/blender/io/usd/intern/usd_writer_mesh.cc b/source/blender/io/usd/intern/usd_writer_mesh.cc index 2073d4cbe87..3f9cb78ea3b 100644 --- a/source/blender/io/usd/intern/usd_writer_mesh.cc +++ b/source/blender/io/usd/intern/usd_writer_mesh.cc @@ -44,9 +44,7 @@ #include <iostream> -namespace blender { -namespace io { -namespace usd { +namespace blender::io::usd { USDGenericMeshWriter::USDGenericMeshWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) { @@ -462,6 +460,4 @@ Mesh *USDMeshWriter::get_export_mesh(Object *object_eval, bool & /*r_needsfree*/ return BKE_object_get_evaluated_mesh(object_eval); } -} // namespace usd -} // namespace io -} // namespace blender +} // namespace blender::io::usd diff --git a/source/blender/io/usd/intern/usd_writer_mesh.h b/source/blender/io/usd/intern/usd_writer_mesh.h index 078daa05501..6345f2d4240 100644 --- a/source/blender/io/usd/intern/usd_writer_mesh.h +++ b/source/blender/io/usd/intern/usd_writer_mesh.h @@ -22,9 +22,7 @@ #include <pxr/usd/usdGeom/mesh.h> -namespace blender { -namespace io { -namespace usd { +namespace blender::io::usd { struct USDMeshData; @@ -62,6 +60,4 @@ class USDMeshWriter : public USDGenericMeshWriter { virtual Mesh *get_export_mesh(Object *object_eval, bool &r_needsfree) override; }; -} // namespace usd -} // namespace io -} // namespace blender +} // namespace blender::io::usd diff --git a/source/blender/io/usd/intern/usd_writer_metaball.cc b/source/blender/io/usd/intern/usd_writer_metaball.cc index f003fba18a4..8e32bd4705a 100644 --- a/source/blender/io/usd/intern/usd_writer_metaball.cc +++ b/source/blender/io/usd/intern/usd_writer_metaball.cc @@ -34,9 +34,7 @@ #include "DNA_mesh_types.h" #include "DNA_meta_types.h" -namespace blender { -namespace io { -namespace usd { +namespace blender::io::usd { USDMetaballWriter::USDMetaballWriter(const USDExporterContext &ctx) : USDGenericMeshWriter(ctx) { @@ -78,6 +76,4 @@ bool USDMetaballWriter::is_basis_ball(Scene *scene, Object *ob) const return ob == basis_ob; } -} // namespace usd -} // namespace io -} // namespace blender +} // namespace blender::io::usd diff --git a/source/blender/io/usd/intern/usd_writer_metaball.h b/source/blender/io/usd/intern/usd_writer_metaball.h index 216f5a2638f..f82c001154e 100644 --- a/source/blender/io/usd/intern/usd_writer_metaball.h +++ b/source/blender/io/usd/intern/usd_writer_metaball.h @@ -20,9 +20,7 @@ #include "usd_writer_mesh.h" -namespace blender { -namespace io { -namespace usd { +namespace blender::io::usd { class USDMetaballWriter : public USDGenericMeshWriter { public: @@ -38,6 +36,4 @@ class USDMetaballWriter : public USDGenericMeshWriter { bool is_basis_ball(Scene *scene, Object *ob) const; }; -} // namespace usd -} // namespace io -} // namespace blender +} // namespace blender::io::usd diff --git a/source/blender/io/usd/intern/usd_writer_transform.cc b/source/blender/io/usd/intern/usd_writer_transform.cc index 49983115455..632a6dd0f3f 100644 --- a/source/blender/io/usd/intern/usd_writer_transform.cc +++ b/source/blender/io/usd/intern/usd_writer_transform.cc @@ -28,9 +28,7 @@ #include "DNA_layer_types.h" -namespace blender { -namespace io { -namespace usd { +namespace blender::io::usd { USDTransformWriter::USDTransformWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) { @@ -64,6 +62,4 @@ bool USDTransformWriter::check_is_animated(const HierarchyContext &context) cons return BKE_object_moves_in_time(context.object, context.animation_check_include_parent); } -} // namespace usd -} // namespace io -} // namespace blender +} // namespace blender::io::usd diff --git a/source/blender/io/usd/intern/usd_writer_transform.h b/source/blender/io/usd/intern/usd_writer_transform.h index 39a1f20e7e8..eba87b28faa 100644 --- a/source/blender/io/usd/intern/usd_writer_transform.h +++ b/source/blender/io/usd/intern/usd_writer_transform.h @@ -22,9 +22,7 @@ #include <pxr/usd/usdGeom/xform.h> -namespace blender { -namespace io { -namespace usd { +namespace blender::io::usd { class USDTransformWriter : public USDAbstractWriter { private: @@ -38,6 +36,4 @@ class USDTransformWriter : public USDAbstractWriter { bool check_is_animated(const HierarchyContext &context) const override; }; -} // namespace usd -} // namespace io -} // namespace blender +} // namespace blender::io::usd |