diff options
author | Hans Goudey <h.goudey@me.com> | 2022-09-07 19:56:12 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-09-07 21:14:45 +0300 |
commit | acbe1e3774ace83d82fda0d39303a1c0e16f81f9 (patch) | |
tree | 6f9d28a8727233662af7b13d3e01f18f830e6a5c /source/blender/io/alembic/intern/abc_reader_mesh.cc | |
parent | 8e4fb20c36635a9f9a3bf4cdfe792a6011d4f884 (diff) | |
parent | e53405bf15aa6d386e83ce6daa5b6248690122c9 (diff) |
Merge branch 'master' into refactor-mesh-bevel-weight-generic
Diffstat (limited to 'source/blender/io/alembic/intern/abc_reader_mesh.cc')
-rw-r--r-- | source/blender/io/alembic/intern/abc_reader_mesh.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/io/alembic/intern/abc_reader_mesh.cc b/source/blender/io/alembic/intern/abc_reader_mesh.cc index f53ff80be2f..7274a41a3eb 100644 --- a/source/blender/io/alembic/intern/abc_reader_mesh.cc +++ b/source/blender/io/alembic/intern/abc_reader_mesh.cc @@ -155,7 +155,7 @@ static void read_mverts(CDStreamConfig &config, const AbcMeshData &mesh_data) void read_mverts(Mesh &mesh, const P3fArraySamplePtr positions, const N3fArraySamplePtr normals) { - MutableSpan<MVert> verts = mesh.vertices_for_write(); + MutableSpan<MVert> verts = mesh.verts_for_write(); for (int i = 0; i < positions->size(); i++) { MVert &mvert = verts[i]; Imath::V3f pos_in = (*positions)[i]; @@ -271,7 +271,7 @@ static void process_loop_normals(CDStreamConfig &config, const N3fArraySamplePtr float(*lnors)[3] = static_cast<float(*)[3]>( MEM_malloc_arrayN(loop_count, sizeof(float[3]), "ABC::FaceNormals")); - MPoly *mpoly = mesh->polygons_for_write().data(); + MPoly *mpoly = mesh->polys_for_write().data(); const N3fArraySample &loop_normals = *loop_normals_ptr; int abc_index = 0; for (int i = 0, e = mesh->totpoly; i < e; i++, mpoly++) { @@ -517,9 +517,9 @@ CDStreamConfig get_config(Mesh *mesh, const bool use_vertex_interpolation) { CDStreamConfig config; config.mesh = mesh; - config.mvert = mesh->vertices_for_write().data(); + config.mvert = mesh->verts_for_write().data(); config.mloop = mesh->loops_for_write().data(); - config.mpoly = mesh->polygons_for_write().data(); + config.mpoly = mesh->polys_for_write().data(); config.totvert = mesh->totvert; config.totloop = mesh->totloop; config.totpoly = mesh->totpoly; |