diff options
author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-25 11:43:36 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-25 11:45:26 +0300 |
commit | e353cf8705b0c8da529e0bd229dd13fe2b3c2abc (patch) | |
tree | c683b6de169487ca217cfdef4b8aed9a0da279f4 /source/blender/alembic/intern/abc_object.cc | |
parent | 0a07cdbe80b2999478fa0d062a846e9bcfafc872 (diff) |
Revert "Alembic: Construct ISampleSelector once and pass along"
This reverts commit 099816587a0e064fb6a52c82a737ae8814cf21df. It had some
unforseen side-effects that should be investigated first.
Diffstat (limited to 'source/blender/alembic/intern/abc_object.cc')
-rw-r--r-- | source/blender/alembic/intern/abc_object.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/source/blender/alembic/intern/abc_object.cc b/source/blender/alembic/intern/abc_object.cc index 4c3c060be28..d2698da2cd3 100644 --- a/source/blender/alembic/intern/abc_object.cc +++ b/source/blender/alembic/intern/abc_object.cc @@ -160,15 +160,6 @@ 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]; @@ -224,6 +215,14 @@ Imath::M44d get_matrix(const IXformSchema &schema, const float time) return s0.getMatrix(); } +DerivedMesh *AbcObjectReader::read_derivedmesh(DerivedMesh *dm, + const float UNUSED(time), + int UNUSED(read_flag), + const char **UNUSED(err_str)) +{ + return dm; +} + void AbcObjectReader::setupObjectTransform(const float time) { bool is_constant = false; |