diff options
| author | Jacques Lucke <jacques@blender.org> | 2022-03-02 19:13:57 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2022-03-02 19:13:57 +0300 |
| commit | 037e1ad140d5c0b57d54f64e32a00f7961b7cc17 (patch) | |
| tree | 88b39d9ab0920150a632dc6315aacd771306b20f /source/blender/io/alembic | |
| parent | d86f80f42ad8bb40aeb154980e5e0e2fa77412e2 (diff) | |
| parent | 2fb31f34af84c39116742e20a12222099cd0ff9a (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/io/alembic')
| -rw-r--r-- | source/blender/io/alembic/exporter/abc_writer_hair.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/io/alembic/exporter/abc_writer_hair.cc b/source/blender/io/alembic/exporter/abc_writer_hair.cc index bdf11857580..d12eaf07e29 100644 --- a/source/blender/io/alembic/exporter/abc_writer_hair.cc +++ b/source/blender/io/alembic/exporter/abc_writer_hair.cc @@ -160,7 +160,8 @@ void ABCHairWriter::write_hair_sample(const HierarchyContext &context, psys_interpolate_uvs(tface, face->v4, pa->fuv, r_uv); uv_values.emplace_back(r_uv[0], r_uv[1]); - psys_interpolate_face(mverts, + psys_interpolate_face(mesh, + mverts, vert_normals, face, tface, @@ -275,7 +276,8 @@ void ABCHairWriter::write_hair_child_sample(const HierarchyContext &context, psys_interpolate_uvs(tface, face->v4, pc->fuv, r_uv); uv_values.emplace_back(r_uv[0], r_uv[1]); - psys_interpolate_face(mverts, + psys_interpolate_face(mesh, + mverts, vert_normals, face, tface, |