diff options
author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-06-06 12:06:11 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-06-07 11:48:52 +0300 |
commit | 5b0f96f97cd427daef7b00331b841580f6ffcdcf (patch) | |
tree | 6d1411036449db0320932037628b1026006551c4 /source/blender/alembic/intern/alembic_capi.cc | |
parent | f447411a826f3e9daff9da9fc5ef1ba882417668 (diff) |
Alembic import: port DerivedMesh → Mesh
Diffstat (limited to 'source/blender/alembic/intern/alembic_capi.cc')
-rw-r--r-- | source/blender/alembic/intern/alembic_capi.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc index 1a6990a1de8..a32eabf2470 100644 --- a/source/blender/alembic/intern/alembic_capi.cc +++ b/source/blender/alembic/intern/alembic_capi.cc @@ -960,12 +960,12 @@ void ABC_get_transform(CacheReader *reader, float r_mat[4][4], float time, float /* ************************************************************************** */ -DerivedMesh *ABC_read_mesh(CacheReader *reader, - Object *ob, - DerivedMesh *dm, - const float time, - const char **err_str, - int read_flag) +Mesh *ABC_read_mesh(CacheReader *reader, + Object *ob, + Mesh *existing_mesh, + const float time, + const char **err_str, + int read_flag) { AbcObjectReader *abc_reader = reinterpret_cast<AbcObjectReader *>(reader); IObject iobject = abc_reader->iobject(); @@ -984,7 +984,7 @@ DerivedMesh *ABC_read_mesh(CacheReader *reader, /* kFloorIndex is used to be compatible with non-interpolating * properties; they use the floor. */ ISampleSelector sample_sel(time, ISampleSelector::kFloorIndex); - return abc_reader->read_derivedmesh(dm, sample_sel, read_flag, err_str); + return abc_reader->read_mesh(existing_mesh, sample_sel, read_flag, err_str); } /* ************************************************************************** */ |