diff options
Diffstat (limited to 'source/blender/alembic/intern/abc_hair.cc')
| -rw-r--r-- | source/blender/alembic/intern/abc_hair.cc | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/source/blender/alembic/intern/abc_hair.cc b/source/blender/alembic/intern/abc_hair.cc index f10cfbadda8..14bcf6731ea 100644 --- a/source/blender/alembic/intern/abc_hair.cc +++ b/source/blender/alembic/intern/abc_hair.cc @@ -37,6 +37,7 @@ extern "C" { #include "BKE_DerivedMesh.h" #include "BKE_object.h" +#include "BKE_particle.h" } using Alembic::Abc::P3fArraySamplePtr; @@ -53,15 +54,13 @@ AbcHairWriter::AbcHairWriter(Scene *scene, AbcTransformWriter *parent, uint32_t time_sampling, ExportSettings &settings, - void *UNUSED(psys)) + ParticleSystem *psys) : AbcObjectWriter(scene, ob, time_sampling, settings, parent) { - m_psys = NULL; // = psys; + m_psys = psys; -#if 0 OCurves curves(parent->alembicXform(), psys->name, m_time_sampling); m_schema = curves.getSchema(); -#endif } void AbcHairWriter::do_write() @@ -69,7 +68,7 @@ void AbcHairWriter::do_write() if (!m_psys) { return; } -#if 0 + ParticleSystemModifierData *psmd = psys_get_modifier(m_object, m_psys); if (!psmd->dm_final) { @@ -117,17 +116,15 @@ void AbcHairWriter::do_write() m_sample.setSelfBounds(bounds()); m_schema.set(m_sample); -#endif } void AbcHairWriter::write_hair_sample(DerivedMesh *dm, - void *part, + ParticleSettings *part, std::vector<Imath::V3f> &verts, std::vector<Imath::V3f> &norm_values, std::vector<Imath::V2f> &uv_values, std::vector<int32_t> &hvertices) { -#if 0 /* Get untransformed vertices, there's a xform under the hair. */ float inv_mat[4][4]; invert_m4_m4_safe(inv_mat, m_object->obmat); @@ -228,17 +225,15 @@ void AbcHairWriter::write_hair_sample(DerivedMesh *dm, ++path; } } -#endif } void AbcHairWriter::write_hair_child_sample(DerivedMesh *dm, - void *part, + ParticleSettings *part, std::vector<Imath::V3f> &verts, std::vector<Imath::V3f> &norm_values, std::vector<Imath::V2f> &uv_values, std::vector<int32_t> &hvertices) { -#if 0 /* Get untransformed vertices, there's a xform under the hair. */ float inv_mat[4][4]; invert_m4_m4_safe(inv_mat, m_object->obmat); @@ -292,5 +287,4 @@ void AbcHairWriter::write_hair_child_sample(DerivedMesh *dm, ++path; } } -#endif } |