diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-21 15:19:05 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-21 15:19:05 +0300 |
| commit | 81011679ddb1fc57e37fe1ba2eb494a1dedaa0fd (patch) | |
| tree | 54dc7feaf7fbcfbb45891a61bef5113af508696a /source/blender/alembic/intern/abc_object.cc | |
| parent | bfa888cef28955501195dfbee002bc793685e527 (diff) | |
| parent | 9c02990ac13a25968d8ec15da15129617d3f25d0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/alembic/intern/abc_object.cc')
| -rw-r--r-- | source/blender/alembic/intern/abc_object.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/alembic/intern/abc_object.cc b/source/blender/alembic/intern/abc_object.cc index 9ccd719063c..972438ef3a6 100644 --- a/source/blender/alembic/intern/abc_object.cc +++ b/source/blender/alembic/intern/abc_object.cc @@ -159,6 +159,15 @@ void AbcObjectReader::object(Object *ob) m_object = ob; } +DerivedMesh *AbcObjectReader::read_derivedmesh(DerivedMesh *dm, + const Alembic::Abc::ISampleSelector &UNUSED(sample_sel), + int UNUSED(read_flag), + const char **UNUSED(err_str)) +{ + return dm; +} + + static Imath::M44d blend_matrices(const Imath::M44d &m0, const Imath::M44d &m1, const float weight) { float mat0[4][4], mat1[4][4], ret[4][4]; |