diff options
Diffstat (limited to 'source/blender/alembic/intern')
-rw-r--r-- | source/blender/alembic/intern/abc_exporter.cc | 2 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_exporter.h | 2 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_hair.cc | 2 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_mesh.cc | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc index d050f3b78b1..d470488937a 100644 --- a/source/blender/alembic/intern/abc_exporter.cc +++ b/source/blender/alembic/intern/abc_exporter.cc @@ -421,7 +421,7 @@ void AbcExporter::exploreTransform(Base *ob_base, Object *parent, Object *dupliO } } -AbcTransformWriter * AbcExporter::createTransformWriter(Object *ob, Object *parent, Object *dupliObParent) +AbcTransformWriter *AbcExporter::createTransformWriter(Object *ob, Object *parent, Object *dupliObParent) { /* An object should not be its own parent, or we'll get infinite loops. */ BLI_assert(ob != parent); diff --git a/source/blender/alembic/intern/abc_exporter.h b/source/blender/alembic/intern/abc_exporter.h index a92e426292c..74af85bfef9 100644 --- a/source/blender/alembic/intern/abc_exporter.h +++ b/source/blender/alembic/intern/abc_exporter.h @@ -116,7 +116,7 @@ private: Alembic::Abc::TimeSamplingPtr createTimeSampling(double step); void createTransformWritersHierarchy(); - AbcTransformWriter * createTransformWriter(Object *ob, Object *parent, Object *dupliObParent); + AbcTransformWriter *createTransformWriter(Object *ob, Object *parent, Object *dupliObParent); void exploreTransform(Base *ob_base, Object *parent, Object *dupliObParent); void exploreObject(Base *ob_base, Object *dupliObParent); void createShapeWriters(); diff --git a/source/blender/alembic/intern/abc_hair.cc b/source/blender/alembic/intern/abc_hair.cc index 83a46a330fd..50c2d04e042 100644 --- a/source/blender/alembic/intern/abc_hair.cc +++ b/source/blender/alembic/intern/abc_hair.cc @@ -133,7 +133,7 @@ void AbcHairWriter::write_hair_sample(Mesh *mesh, m_uv_warning_shown = true; } - ParticleData * pa = m_psys->particles; + ParticleData *pa = m_psys->particles; int k; ParticleCacheKey **cache = m_psys->pathcache; diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc index 2b739837239..4c48b7a5bce 100644 --- a/source/blender/alembic/intern/abc_mesh.cc +++ b/source/blender/alembic/intern/abc_mesh.cc @@ -546,8 +546,7 @@ Mesh *AbcMeshWriter::getFinalMesh(bool &r_needsfree) BM_mesh_triangulate(bm, quad_method, ngon_method, tag_only, NULL, NULL, NULL); - struct BMeshToMeshParams bmmp = {0}; - Mesh *result = BKE_bmesh_to_mesh_nomain(bm, &bmmp); + Mesh *result = BKE_mesh_from_bmesh_for_eval_nomain(bm, 0); BM_mesh_free(bm); mesh = result; |