diff options
author | Falk David <falkdavid@gmx.de> | 2020-09-12 13:17:47 +0300 |
---|---|---|
committer | Falk David <falkdavid@gmx.de> | 2020-09-12 13:17:47 +0300 |
commit | c00523aca49d7e6d3aadf1e4a230ae8fb67044cc (patch) | |
tree | 5e5cb8fd566b75726241a20bf229f989e6f46367 /source/blender/io/alembic/intern/abc_customdata.cc | |
parent | 8156e948042a464ca40ca78c946874340a8421f4 (diff) | |
parent | 269ceb666b01b8cddbfb5babddf38546a41eba39 (diff) |
Merge branch 'greasepencil-edit-curve' into soc-2020-greasepencil-curvesoc-2020-greasepencil-curve
Diffstat (limited to 'source/blender/io/alembic/intern/abc_customdata.cc')
-rw-r--r-- | source/blender/io/alembic/intern/abc_customdata.cc | 8 |
1 files changed, 2 insertions, 6 deletions
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 |