diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 19:22:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-16 19:22:43 +0300 |
| commit | 49ee1a97d2704d8cc707201675a919b9ef103fec (patch) | |
| tree | 17c78db252f4b24297490de623fe5f303cea181a /source/blender/alembic/intern/abc_hair.cc | |
| parent | 292a2802ad376f4a3a2cc7bed763d0f5856dd98c (diff) | |
| parent | eb6fe5fa94b86a0a20742e06bf1e68b4cbaf6693 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/alembic/intern/abc_hair.cc')
| -rw-r--r-- | source/blender/alembic/intern/abc_hair.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/alembic/intern/abc_hair.cc b/source/blender/alembic/intern/abc_hair.cc index 2579aa3cc36..53e8dea89cc 100644 --- a/source/blender/alembic/intern/abc_hair.cc +++ b/source/blender/alembic/intern/abc_hair.cc @@ -253,8 +253,9 @@ void AbcHairWriter::write_hair_child_sample(DerivedMesh *dm, path = cache[p]; if (part->from == PART_FROM_FACE && - part->childtype != PART_CHILD_PARTICLES && - mtface) { + part->childtype != PART_CHILD_PARTICLES && + mtface) + { const int num = pc->num; if (num < 0) { ABC_LOG(m_settings.logger) |