From e38a0eea5c99147d53844e9d586dd6617f857741 Mon Sep 17 00:00:00 2001 From: Aleksi Juvani Date: Fri, 7 Jan 2022 17:45:06 +0100 Subject: 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 --- source/blender/editors/physics/particle_object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { -- cgit v1.2.3