archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T54488: hair disconnect/reconnect not working with modifiers

Browse Source 
Take the Use Modifier Stack setting into account when connecting hair, and
fix wrong results results when using deforming modifiers also.

Differential Revision: https://developer.blender.org/D13704
This commit is contained in:
Aleksi Juvani
2022-01-05 16:36:34 +01:00
committed by Brecht Van Lommel
parent 1031638c51
commit 5dedb39d44
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/editors/physics/particle_object.c
View File

@@ -743,8 +743,10 @@ static bool remap_hair_emitter(Depsgraph *depsgraph,
invert_m4_m4(from_imat, from_mat); invert_m4_m4(from_imat, from_mat);
invert_m4_m4(to_imat, to_mat); invert_m4_m4(to_imat, to_mat);
if (target_psmd->mesh_final->runtime.deformed_only) { const bool use_dm_final_indices = (target_psys->part->use_modifier_stack &&
/* we don't want to mess up target_psmd->dm when converting to global coordinates below */ !target_psmd->mesh_final->runtime.deformed_only);
if (use_dm_final_indices) {
mesh = target_psmd->mesh_final; mesh = target_psmd->mesh_final;
} }
else { else {
@@ -755,6 +757,7 @@ static bool remap_hair_emitter(Depsgraph *depsgraph,
return false; return false;
} }
/* don't modify the original vertices */ /* don't modify the original vertices */
/* we don't want to mess up target_psmd->dm when converting to global coordinates below */
mesh = (Mesh *)BKE_id_copy_ex(NULL, &mesh->id, NULL, LIB_ID_COPY_LOCALIZE); mesh = (Mesh *)BKE_id_copy_ex(NULL, &mesh->id, NULL, LIB_ID_COPY_LOCALIZE);
/* BMESH_ONLY, deform dm may not have tessface */ /* BMESH_ONLY, deform dm may not have tessface */
@@ -825,7 +828,13 @@ static bool remap_hair_emitter(Depsgraph *depsgraph,
tpa->foffset = 0.0f; tpa->foffset = 0.0f;
tpa->num = nearest.index; tpa->num = nearest.index;
tpa->num_dmcache = psys_particle_dm_face_lookup(target_mesh, mesh, tpa->num, tpa->fuv, NULL); if (use_dm_final_indices) {
tpa->num_dmcache = DMCACHE_ISCHILD;
}
else {
tpa->num_dmcache = psys_particle_dm_face_lookup(
target_psmd->mesh_final, target_psmd->mesh_original, tpa->num, tpa->fuv, NULL);
}
} }
else { else {
me = &medge[nearest.index]; me = &medge[nearest.index];