diff options
Diffstat (limited to 'source/blender/alembic/intern/abc_object.h')
| -rw-r--r-- | source/blender/alembic/intern/abc_object.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/source/blender/alembic/intern/abc_object.h b/source/blender/alembic/intern/abc_object.h index 852ef451f23..8794cb61708 100644 --- a/source/blender/alembic/intern/abc_object.h +++ b/source/blender/alembic/intern/abc_object.h @@ -44,7 +44,6 @@ protected: Object *m_object; ExportSettings &m_settings; - Scene *m_scene; uint32_t m_time_sampling; Imath::Box3d m_bounds; @@ -56,8 +55,7 @@ protected: std::string m_name; public: - AbcObjectWriter(Scene *scene, - Object *ob, + AbcObjectWriter(Object *ob, uint32_t time_sampling, ExportSettings &settings, AbcObjectWriter *parent = NULL); @@ -122,7 +120,7 @@ static bool has_animations(Schema &schema, ImportSettings *settings) /* ************************************************************************** */ -struct DerivedMesh; +struct Mesh; using Alembic::AbcCoreAbstract::chrono_t; @@ -178,10 +176,10 @@ public: virtual void readObjectData(Main *bmain, const Alembic::Abc::ISampleSelector &sample_sel) = 0; - virtual DerivedMesh *read_derivedmesh(DerivedMesh *dm, - const Alembic::Abc::ISampleSelector &sample_sel, - int read_flag, - const char **err_str); + virtual struct Mesh *read_mesh(struct Mesh *mesh, + 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); |