Commit: 1152caad3254d0d11d06fd01e55784f51d2a9b9a Author: Aleksi Juvani Date: Fri Jan 7 17:45:06 2022 +0100 Branches: master https://developer.blender.org/rB1152caad3254d0d11d06fd01e55784f51d2a9b9a
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 =================================================================== M source/blender/editors/physics/particle_object.c =================================================================== diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 4f571fa6353..896a37c3984 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -746,7 +746,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 { _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
