Fix T59365: Blender crashes when I try to open a .blend file.

Broken logic in check for a valid vgroup storage pointer...
This commit is contained in:
Bastien Montagne 2018-12-14 14:44:20 +01:00
parent c1adf86a2e
commit 9d4ab3fe58
Notes: blender-bot 2023-02-14 04:28:49 +01:00
Referenced by issue #59365, Blender crashes when I try to open a .blend file
1 changed files with 2 additions and 4 deletions

View File

@ -279,7 +279,6 @@ static void mesh_merge_transform(
MEdge *me;
MLoop *ml;
MPoly *mp;
MDeformVert *dvert;
CustomData_copy_data(&cap_mesh->vdata, &result->vdata, 0, cap_verts_index, cap_nverts);
CustomData_copy_data(&cap_mesh->edata, &result->edata, 0, cap_edges_index, cap_nedges);
@ -295,9 +294,8 @@ static void mesh_merge_transform(
}
/* remap the vertex groups if necessary */
dvert = result->dvert + cap_verts_index;
if (dvert != NULL) {
BKE_object_defgroup_index_map_apply(dvert, cap_nverts, remap, remap_len);
if (result->dvert != NULL) {
BKE_object_defgroup_index_map_apply(&result->dvert[cap_verts_index], cap_nverts, remap, remap_len);
}
/* adjust cap edge vertex indices */