Alembic import: port DerivedMesh → Mesh
[blender.git] / source / blender / alembic / intern / abc_mesh.h
index c57123cda4c6438b3adb3ba15bf93c7d06bc31fa..455d263c6895e822c92b2f1c262840b59335c466 100644 (file)
@@ -106,10 +106,10 @@ public:
                               const char **err_str) const;
        void readObjectData(Main *bmain, const Alembic::Abc::ISampleSelector &sample_sel);
 
-       DerivedMesh *read_derivedmesh(DerivedMesh *dm,
-                                     const Alembic::Abc::ISampleSelector &sample_sel,
-                                     int read_flag,
-                                     const char **err_str);
+       struct Mesh *read_mesh(struct Mesh *existing_mesh,
+                              const Alembic::Abc::ISampleSelector &sample_sel,
+                              int read_flag,
+                              const char **err_str);
 
 private:
        void readFaceSetsSample(Main *bmain, Mesh *mesh, size_t poly_start,
@@ -136,10 +136,10 @@ public:
                                 const Object *const ob,
                                 const char **err_str) const;
        void readObjectData(Main *bmain, const Alembic::Abc::ISampleSelector &sample_sel);
-       DerivedMesh *read_derivedmesh(DerivedMesh *dm,
-                                     const Alembic::Abc::ISampleSelector &sample_sel,
-                                     int read_flag,
-                                     const char **err_str);
+       struct Mesh *read_mesh(struct Mesh *existing_mesh,
+                              const Alembic::Abc::ISampleSelector &sample_sel,
+                              int read_flag,
+                              const char **err_str);
 };
 
 /* ************************************************************************** */
@@ -148,6 +148,6 @@ void read_mverts(MVert *mverts,
                  const Alembic::AbcGeom::P3fArraySamplePtr &positions,
                  const Alembic::AbcGeom::N3fArraySamplePtr &normals);
 
-CDStreamConfig get_config(DerivedMesh *dm);
+CDStreamConfig get_config(struct Mesh *mesh);
 
 #endif  /* __ABC_MESH_H__ */