[Bf-blender-cvs] [9d4ab3fe58a] blender2.8: Fix T59365: Blender crashes when I try to open a .blend file.
Bastien Montagne
noreply at git.blender.org
Fri Dec 14 14:45:37 CET 2018
Commit: 9d4ab3fe58ab1fe8658bb006d6c9596fbf498359
Author: Bastien Montagne
Date: Fri Dec 14 14:44:20 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB9d4ab3fe58ab1fe8658bb006d6c9596fbf498359
Fix T59365: Blender crashes when I try to open a .blend file.
Broken logic in check for a valid vgroup storage pointer...
===================================================================
M source/blender/modifiers/intern/MOD_array.c
===================================================================
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 */
More information about the Bf-blender-cvs
mailing list