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/alembic/intern/abc_customdata.h | |
parent | 87df15190210eb84ef52e5dccc2932918f912da5 (diff) | |
parent | 0829cebeb024095c268f190c34daa8ae9a5a224c (diff) |
Merge branch 'asset-uuid--archived' into asset-engine--archivedasset-engine--archived
Diffstat (limited to 'source/blender/io/alembic/intern/abc_customdata.h')
-rw-r--r-- | source/blender/io/alembic/intern/abc_customdata.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/io/alembic/intern/abc_customdata.h b/source/blender/io/alembic/intern/abc_customdata.h index 96b57b08681..8f4accb70dc 100644 --- a/source/blender/io/alembic/intern/abc_customdata.h +++ b/source/blender/io/alembic/intern/abc_customdata.h @@ -16,14 +16,12 @@ * The Original Code is Copyright (C) 2016 Kévin Dietrich. * All rights reserved. */ +#pragma once /** \file * \ingroup balembic */ -#ifndef __ABC_CUSTOMDATA_H__ -#define __ABC_CUSTOMDATA_H__ - #include <Alembic/Abc/All.h> #include <Alembic/AbcGeom/All.h> @@ -38,6 +36,9 @@ struct Mesh; using Alembic::Abc::ICompoundProperty; using Alembic::Abc::OCompoundProperty; +namespace blender { +namespace io { +namespace alembic { struct UVSample { std::vector<Imath::V2f> uvs; @@ -112,4 +113,6 @@ void read_custom_data(const std::string &iobject_full_name, const CDStreamConfig &config, const Alembic::Abc::ISampleSelector &iss); -#endif /* __ABC_CUSTOMDATA_H__ */ +} // namespace alembic +} // namespace io +} // namespace blender |