diff options
author | Julian Eisel <julian@blender.org> | 2020-07-01 18:25:04 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-07-01 18:25:04 +0300 |
commit | 889c4ca9c26d770af02cedef972d65eb173bdb5e (patch) | |
tree | 6f46156146db1b3f09d92c6eaa1f44ba8a584ed4 /source/blender/io/usd/intern/usd_writer_metaball.h | |
parent | 87df15190210eb84ef52e5dccc2932918f912da5 (diff) | |
parent | 0829cebeb024095c268f190c34daa8ae9a5a224c (diff) |
Merge branch 'asset-uuid--archived' into asset-engine--archivedasset-engine--archived
Diffstat (limited to 'source/blender/io/usd/intern/usd_writer_metaball.h')
-rw-r--r-- | source/blender/io/usd/intern/usd_writer_metaball.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/io/usd/intern/usd_writer_metaball.h b/source/blender/io/usd/intern/usd_writer_metaball.h index 1a86daae2ae..9f51a3314a5 100644 --- a/source/blender/io/usd/intern/usd_writer_metaball.h +++ b/source/blender/io/usd/intern/usd_writer_metaball.h @@ -21,7 +21,9 @@ #include "usd_writer_mesh.h" -namespace USD { +namespace blender { +namespace io { +namespace usd { class USDMetaballWriter : public USDGenericMeshWriter { public: @@ -37,6 +39,8 @@ class USDMetaballWriter : public USDGenericMeshWriter { bool is_basis_ball(Scene *scene, Object *ob) const; }; -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender #endif /* __USD_WRITER_METABALL_H__ */ |