Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@stuvel.eu>2017-04-21 12:04:47 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2017-04-21 15:11:49 +0300
commit099816587a0e064fb6a52c82a737ae8814cf21df (patch)
tree250508ab6196323c32bfec0ab516f5b8f0fff2e5 /source/blender/alembic/intern/abc_object.h
parentdf84082c70dafde0aa3a6a474f7885788e507ae1 (diff)
Alembic: Construct ISampleSelector once and pass along
No longer passing time as float and constructing ISampleSelectors all over the place. Instead, just construct an ISampleSelector once and pass it along.
Diffstat (limited to 'source/blender/alembic/intern/abc_object.h')
-rw-r--r--source/blender/alembic/intern/abc_object.h15
1 files changed, 6 insertions, 9 deletions
diff --git a/source/blender/alembic/intern/abc_object.h b/source/blender/alembic/intern/abc_object.h
index d5344533b55..a9dbaa89c97 100644
--- a/source/blender/alembic/intern/abc_object.h
+++ b/source/blender/alembic/intern/abc_object.h
@@ -170,15 +170,12 @@ public:
virtual bool valid() const = 0;
- virtual void readObjectData(Main *bmain, float time) = 0;
-
- virtual DerivedMesh *read_derivedmesh(DerivedMesh *dm, const float time, int read_flag, const char **err_str)
- {
- (void)time;
- (void)read_flag;
- (void)err_str;
- return dm;
- }
+ virtual void readObjectData(Main *bmain, const Alembic::Abc::ISampleSelector &sample_sel) = 0;
+
+ DerivedMesh *read_derivedmesh(DerivedMesh *dm,
+ const Alembic::Abc::ISampleSelector &sample_sel,
+ int read_flag,
+ const char **err_str);
/** Reads the object matrix and sets up an object transform if animated. */
void setupObjectTransform(const float time);