Merge branch 'master' into blender2.8

[blender.git] / source / blender / alembic / intern / abc_object.cc

diff --git a/source/blender/alembic/intern/abc_object.cc b/source/blender/alembic/intern/abc_object.cc
index 28a4d1850148654623742e1d4a4d534d2c7fff6a..8b169988096617e51c28fa12b300ad54afb4917d 100644 (file)
--- a/source/blender/alembic/intern/abc_object.cc
+++ b/source/blender/alembic/intern/abc_object.cc
@@ -215,9 +215,9 @@ Imath::M44d get_matrix(const IXformSchema &schema, const float time)
 }
 
 DerivedMesh *AbcObjectReader::read_derivedmesh(DerivedMesh *dm,
-                                                       const float UNUSED(time),
-                                                       int UNUSED(read_flag),
-                                                       const char **UNUSED(err_str))
+                                               const Alembic::Abc::ISampleSelector &UNUSED(sample_sel),
+                                               int UNUSED(read_flag),
+                                               const char **UNUSED(err_str))
 {
        return dm;
 }