diff options
| author | João Araújo <jaraujo98@gmail.com> | 2017-07-26 13:25:24 +0300 |
|---|---|---|
| committer | João Araújo <jaraujo98@gmail.com> | 2017-07-26 13:25:24 +0300 |
| commit | 59908f5eb73670c97c5bb817290a0dac99089900 (patch) | |
| tree | 709de097c1fac2ff7b172a8b50dc8a91d7b74860 /source/blender/alembic/intern/abc_camera.h | |
| parent | 595f2ca2e06e07acaccc473982bde7a5ed644b50 (diff) | |
| parent | edc6bec9d60204cb81d2e7533402630b076d0d32 (diff) | |
Merge remote-tracking branch 'origin/master' into gsoc2016-improved_extrusiongsoc2016-improved_extrusion
Diffstat (limited to 'source/blender/alembic/intern/abc_camera.h')
| -rw-r--r-- | source/blender/alembic/intern/abc_camera.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/alembic/intern/abc_camera.h b/source/blender/alembic/intern/abc_camera.h index fafb4d3eb39..16c5cccd5ea 100644 --- a/source/blender/alembic/intern/abc_camera.h +++ b/source/blender/alembic/intern/abc_camera.h @@ -54,8 +54,11 @@ public: AbcCameraReader(const Alembic::Abc::IObject &object, ImportSettings &settings); bool valid() const; + bool accepts_object_type(const Alembic::AbcCoreAbstract::ObjectHeader &alembic_header, + const Object *const ob, + const char **err_str) const; - void readObjectData(Main *bmain, float time); + void readObjectData(Main *bmain, const Alembic::Abc::ISampleSelector &sample_sel); }; -#endif /* __ABC_CAMERA_H__ */
\ No newline at end of file +#endif /* __ABC_CAMERA_H__ */ |