diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-19 16:07:54 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-19 16:07:54 +0300 |
| commit | 781108cdc6095f126ad0c77411d39acb52f11aa0 (patch) | |
| tree | 872302d1489cedac077074679351acbf3097e059 /source/blender/alembic/intern/abc_exporter.h | |
| parent | b01df8222f7d262c7cc08a6e38ab693cad5e27da (diff) | |
| parent | 2dac8b3ee043d9d50e334c7430dc3aee49a3315e (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# source/blender/alembic/intern/abc_exporter.cc
# source/blender/alembic/intern/abc_exporter.h
Diffstat (limited to 'source/blender/alembic/intern/abc_exporter.h')
| -rw-r--r-- | source/blender/alembic/intern/abc_exporter.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/alembic/intern/abc_exporter.h b/source/blender/alembic/intern/abc_exporter.h index 75a2e0074f1..3831acaafab 100644 --- a/source/blender/alembic/intern/abc_exporter.h +++ b/source/blender/alembic/intern/abc_exporter.h @@ -66,6 +66,8 @@ struct ExportSettings { bool export_vcols; bool export_face_sets; bool export_vweigths; + bool export_hair; + bool export_particles; bool apply_subdiv; bool use_subdiv_schema; @@ -117,6 +119,7 @@ private: void exploreObject(EvaluationContext *eval_ctx, Base *ob_base, Object *dupliObParent); void createShapeWriters(EvaluationContext *eval_ctx); void createShapeWriter(Base *ob_base, Object *dupliObParent); + void createParticleSystemsWriters(Object *ob, AbcTransformWriter *xform); AbcTransformWriter *getXForm(const std::string &name); |