diff options
author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2021-07-05 17:10:18 +0300 |
---|---|---|
committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2021-07-05 17:10:18 +0300 |
commit | d007f753cd03f7eb00fa44cdcc63fe76449d622a (patch) | |
tree | 22a2ad47355e7f8a869ed8e358044e965349a35c /source/blender/io/alembic | |
parent | d49ddce9c1562daf7af9a966fd845def7e1bee84 (diff) | |
parent | bb971bead9a88a216845e194e50e197c125f2598 (diff) |
Merge branch 'master' into cycles_procedural_api
Diffstat (limited to 'source/blender/io/alembic')
-rw-r--r-- | source/blender/io/alembic/intern/abc_reader_mesh.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/io/alembic/intern/abc_reader_mesh.cc b/source/blender/io/alembic/intern/abc_reader_mesh.cc index 871ac018e58..77edd4908bd 100644 --- a/source/blender/io/alembic/intern/abc_reader_mesh.cc +++ b/source/blender/io/alembic/intern/abc_reader_mesh.cc @@ -565,7 +565,7 @@ void AbcMeshReader::readObjectData(Main *bmain, const Alembic::Abc::ISampleSelec Mesh *read_mesh = this->read_mesh(mesh, sample_sel, MOD_MESHSEQ_READ_ALL, nullptr); if (read_mesh != mesh) { - /* XXX fixme after 2.80; mesh->flag isn't copied by BKE_mesh_nomain_to_mesh() */ + /* XXX FIXME: after 2.80; mesh->flag isn't copied by #BKE_mesh_nomain_to_mesh(). */ /* read_mesh can be freed by BKE_mesh_nomain_to_mesh(), so get the flag before that happens. */ short autosmooth = (read_mesh->flag & ME_AUTOSMOOTH); BKE_mesh_nomain_to_mesh(read_mesh, mesh, m_object, &CD_MASK_EVERYTHING, true); |