diff options
author | Hans Goudey <h.goudey@me.com> | 2021-07-15 19:25:36 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-07-15 19:25:36 +0300 |
commit | 0cc2a72f94b71d5594a0aca088007ecbb3221b60 (patch) | |
tree | 6424949014f475643d5450d74ae7d75eb99689a8 /source/blender/blenkernel/intern/mesh.c | |
parent | 3af0e1f6fd311c32037241ab70e05b0ecde7f301 (diff) |
Fix failing tests from vertex group name parameter copy
It turns out `BKE_mesh_copy_parameters` can be called while other
tools are running calculations, which meant that it was called at the
same time as `armature_deform_coords_impl`. Beause of that, we
shouldn't do any freeing (of the old vertex group names) there.
Since the materials are copied in the "for_eval" version anyway,
it seems to make sense to copy the vertex group name list there also.
Fixes T89877, and also the failing `deform_modifiers` test.
Differential Revision: https://developer.blender.org/D11936
Diffstat (limited to 'source/blender/blenkernel/intern/mesh.c')
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index c4186ad3180..4102703ca7c 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -932,10 +932,6 @@ void BKE_mesh_copy_parameters(Mesh *me_dst, const Mesh *me_src) copy_v3_v3(me_dst->loc, me_src->loc); copy_v3_v3(me_dst->size, me_src->size); - /* Some callers call this on existing meshes, so free the existing vertex groups first. */ - BLI_freelistN(&me_dst->vertex_group_names); - BKE_defgroup_copy_list(&me_dst->vertex_group_names, &me_src->vertex_group_names); - me_dst->vertex_group_active_index = me_src->vertex_group_active_index; } @@ -952,6 +948,10 @@ void BKE_mesh_copy_parameters_for_eval(Mesh *me_dst, const Mesh *me_src) BKE_mesh_copy_parameters(me_dst, me_src); + /* Copy vertex group names. */ + BLI_assert(BLI_listbase_is_empty(&me_dst->vertex_group_names)); + BKE_defgroup_copy_list(&me_dst->vertex_group_names, &me_src->vertex_group_names); + /* Copy materials. */ if (me_dst->mat != NULL) { MEM_freeN(me_dst->mat); |