From 96f6520734c5fa9cd0c4d04071128faef31abed4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 28 Nov 2019 04:16:38 +1100 Subject: Fix crash exiting edit-mode with an active basis shape key Exposed by T71865, while the bug remains this resolves the crash. --- source/blender/bmesh/intern/bmesh_mesh_conv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c index 9bab959f0a2..5f0c673b379 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.c +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c @@ -879,7 +879,7 @@ void BM_mesh_bm_to_me(Main *bmain, BMesh *bm, Mesh *me, const struct BMeshToMesh BM_ITER_MESH_INDEX (eve, &iter, bm, BM_VERTS_OF_MESH, i) { const int keyi = BM_ELEM_CD_GET_INT(eve, cd_shape_keyindex_offset); - if (keyi != ORIGINDEX_NONE) { + if (keyi != ORIGINDEX_NONE && keyi < actkey->totelem) { sub_v3_v3v3(ofs[i], mvert->co, fp[keyi]); } else { -- cgit v1.2.3