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-25 11:43:36 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2017-04-25 11:45:26 +0300
commite353cf8705b0c8da529e0bd229dd13fe2b3c2abc (patch)
treec683b6de169487ca217cfdef4b8aed9a0da279f4 /source/blender/alembic/intern/abc_camera.cc
parent0a07cdbe80b2999478fa0d062a846e9bcfafc872 (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_camera.cc')
-rw-r--r--source/blender/alembic/intern/abc_camera.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/alembic/intern/abc_camera.cc b/source/blender/alembic/intern/abc_camera.cc
index 33344f6c9c5..4f70b2a972c 100644
--- a/source/blender/alembic/intern/abc_camera.cc
+++ b/source/blender/alembic/intern/abc_camera.cc
@@ -117,10 +117,11 @@ bool AbcCameraReader::valid() const
return m_schema.valid();
}
-void AbcCameraReader::readObjectData(Main *bmain, const ISampleSelector &sample_sel)
+void AbcCameraReader::readObjectData(Main *bmain, float time)
{
Camera *bcam = static_cast<Camera *>(BKE_camera_add(bmain, m_data_name.c_str()));
+ ISampleSelector sample_sel(time);
CameraSample cam_sample;
m_schema.get(cam_sample, sample_sel);