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/blenkernel/intern/particle_distribute.c | |
| parent | d86f80f42ad8bb40aeb154980e5e0e2fa77412e2 (diff) | |
| parent | 2fb31f34af84c39116742e20a12222099cd0ff9a (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/blenkernel/intern/particle_distribute.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_distribute.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_distribute.c b/source/blender/blenkernel/intern/particle_distribute.c index aa209102522..83fb52ce1ef 100644 --- a/source/blender/blenkernel/intern/particle_distribute.c +++ b/source/blender/blenkernel/intern/particle_distribute.c @@ -611,7 +611,7 @@ static void distribute_from_volume_exec(ParticleTask *thread, ParticleData *pa, tot = mesh->totface; psys_interpolate_face( - mvert, BKE_mesh_vertex_normals_ensure(mesh), mface, 0, 0, pa->fuv, co, nor, 0, 0, 0); + mesh, mvert, BKE_mesh_vertex_normals_ensure(mesh), mface, 0, 0, pa->fuv, co, nor, 0, 0, 0); normalize_v3(nor); negate_v3(nor); @@ -942,6 +942,9 @@ static int psys_thread_context_init_distribute(ParticleThreadContext *ctx, } } + /* After this #BKE_mesh_orco_verts_transform can be used safely from multiple threads. */ + BKE_mesh_texspace_ensure(final_mesh); + /* Create trees and original coordinates if needed */ if (from == PART_FROM_CHILD) { distr = PART_DISTR_RAND; |