diff options
| author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2021-05-18 02:15:36 +0300 |
|---|---|---|
| committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2021-05-18 02:15:36 +0300 |
| commit | 6aaa0a14aa9115489152c6b6d23db6a679fe6f48 (patch) | |
| tree | 0c6307c2acf88d3e6ce18bd97c00406e75d191a7 /source/blender/io/alembic | |
| parent | 0a2a9b7b1ca56530fd00949c9a5b2c06fbf5d369 (diff) | |
| parent | 8057b985727d4aabeb5c14143fcd9ef9088fbc00 (diff) | |
Merge branch 'master' into cycles_procedural_api
Diffstat (limited to 'source/blender/io/alembic')
| -rw-r--r-- | source/blender/io/alembic/exporter/abc_writer_mball.cc | 2 | ||||
| -rw-r--r-- | source/blender/io/alembic/exporter/abc_writer_mesh.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/io/alembic/exporter/abc_writer_mball.cc b/source/blender/io/alembic/exporter/abc_writer_mball.cc index a797310f864..ad78f8ce802 100644 --- a/source/blender/io/alembic/exporter/abc_writer_mball.cc +++ b/source/blender/io/alembic/exporter/abc_writer_mball.cc @@ -69,7 +69,7 @@ Mesh *ABCMetaballWriter::get_export_mesh(Object *object_eval, bool &r_needsfree) return mesh_eval; } r_needsfree = true; - return BKE_mesh_new_from_object(args_.depsgraph, object_eval, false); + return BKE_mesh_new_from_object(args_.depsgraph, object_eval, false, false); } void ABCMetaballWriter::free_export_mesh(Mesh *mesh) diff --git a/source/blender/io/alembic/exporter/abc_writer_mesh.cc b/source/blender/io/alembic/exporter/abc_writer_mesh.cc index c00e57c8edc..29b29324ee3 100644 --- a/source/blender/io/alembic/exporter/abc_writer_mesh.cc +++ b/source/blender/io/alembic/exporter/abc_writer_mesh.cc @@ -250,7 +250,7 @@ void ABCGenericMeshWriter::write_mesh(HierarchyContext &context, Mesh *mesh) UVSample uvs_and_indices; - if (!frame_has_been_written_ && args_.export_params->uvs) { + if (args_.export_params->uvs) { const char *name = get_uv_sample(uvs_and_indices, m_custom_data_config, &mesh->ldata); if (!uvs_and_indices.indices.empty() && !uvs_and_indices.uvs.empty()) { @@ -312,7 +312,7 @@ void ABCGenericMeshWriter::write_subd(HierarchyContext &context, struct Mesh *me V3fArraySample(points), Int32ArraySample(poly_verts), Int32ArraySample(loop_counts)); UVSample sample; - if (!frame_has_been_written_ && args_.export_params->uvs) { + if (args_.export_params->uvs) { const char *name = get_uv_sample(sample, m_custom_data_config, &mesh->ldata); if (!sample.indices.empty() && !sample.uvs.empty()) { |