diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-12-14 16:44:20 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-12-14 16:44:20 +0300 |
| commit | 9d4ab3fe58ab1fe8658bb006d6c9596fbf498359 (patch) | |
| tree | 1247861e2ee344e1640533d8e0b20fe468ffa0f4 /source/blender/modifiers | |
| parent | c1adf86a2ef30a9033ff7cfe757b1e7c7b174784 (diff) | |
Fix T59365: Blender crashes when I try to open a .blend file.
Broken logic in check for a valid vgroup storage pointer...
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_array.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_array.c b/source/blender/modifiers/intern/MOD_array.c index 597320c3887..d14d8f2288e 100644 --- a/source/blender/modifiers/intern/MOD_array.c +++ b/source/blender/modifiers/intern/MOD_array.c @@ -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 */ |