diff options
| author | Aleksi Juvani <aleksijuvani> | 2022-01-07 19:45:06 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2022-01-11 16:48:14 +0300 |
| commit | e38a0eea5c99147d53844e9d586dd6617f857741 (patch) | |
| tree | 11c3cbfaf6b7823881f3da8650c2aa599f8dbf32 /source | |
| parent | db9ddb8a453f88321d0b43609f532bc2c729fbcc (diff) | |
Fix: connecting hair fails on meshes with no generative modifiers
Fixes a bug introduced in rB5dedb39d447b. `mesh_original` is not set if the
mesh has no generative modifiers, in which case we can use `mesh_final`, which
would seem to be consistent with the rest of the particle code. An alternative
approach would be to make sure that `mesh_original` is always set in
`deformVerts`.
Differential Revision: https://developer.blender.org/D13754
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/physics/particle_object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 9ccbcf93b09..8ba600d3a7d 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -745,7 +745,7 @@ static bool remap_hair_emitter(Depsgraph *depsgraph, const bool use_dm_final_indices = (target_psys->part->use_modifier_stack && !target_psmd->mesh_final->runtime.deformed_only); - if (use_dm_final_indices) { + if (use_dm_final_indices || !target_psmd->mesh_original) { mesh = target_psmd->mesh_final; } else { |