diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-12-28 19:30:58 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-12-28 19:30:58 +0300 |
| commit | 6ecab6dd8e48d564a2b43e0e81e79d079e8b4c77 (patch) | |
| tree | 618e2d24eb34a05a81f726dd52eb2b7468e9296d /source/blender/alembic/intern/abc_hair.h | |
| parent | 605263177b8eea24c1449e4dbf0138175ec3dddf (diff) | |
Revert particle system and point cache removal in blender2.8 branch.
This reverts commit 5aa19be91263a249ffae75573e3b32f24269d890 and b4a721af694817fa921b119df83d33ede7d7fed0.
Due to postponement of particle system rewrite it was decided to put particle code
back into the 2.8 branch for the time being.
Diffstat (limited to 'source/blender/alembic/intern/abc_hair.h')
| -rw-r--r-- | source/blender/alembic/intern/abc_hair.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/alembic/intern/abc_hair.h b/source/blender/alembic/intern/abc_hair.h index bbd5f2c4361..d132b60be12 100644 --- a/source/blender/alembic/intern/abc_hair.h +++ b/source/blender/alembic/intern/abc_hair.h @@ -26,11 +26,13 @@ #include "abc_object.h" struct DerivedMesh; +struct ParticleSettings; +struct ParticleSystem; /* ************************************************************************** */ class AbcHairWriter : public AbcObjectWriter { - /*ParticleSystem*/ void *m_psys; + ParticleSystem *m_psys; Alembic::AbcGeom::OCurvesSchema m_schema; Alembic::AbcGeom::OCurvesSchema::Sample m_sample; @@ -41,20 +43,20 @@ public: AbcTransformWriter *parent, uint32_t time_sampling, ExportSettings &settings, - /*ParticleSystem*/void *psys); + ParticleSystem *psys); private: virtual void do_write(); void write_hair_sample(DerivedMesh *dm, - /*ParticleSettings*/ 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); void write_hair_child_sample(DerivedMesh *dm, - /*ParticleSettings*/ void *part, + ParticleSettings *part, std::vector<Imath::V3f> &verts, std::vector<Imath::V3f> &norm_values, std::vector<Imath::V2f> &uv_values, |