diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2020-05-25 11:45:39 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-05-25 11:45:39 +0300 |
| commit | 528f0b95c4462b2e429600a566ca0434c90310f6 (patch) | |
| tree | 1185ea1afe8107fc48a794e1fb97e08d004e5711 /source/blender/bmesh | |
| parent | 5a842b3412c100588bc1f7a9d4532e810e8e1792 (diff) | |
| parent | 41bb0548b0c1ac62d30cf14fca371b220e40f72e (diff) | |
Merge remote-tracking branch 'origin/blender-v2.83-release'
Diffstat (limited to 'source/blender/bmesh')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh_conv.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/bmesh/intern/bmesh_mesh_conv.c b/source/blender/bmesh/intern/bmesh_mesh_conv.c index de32d7881b0..b8508f7e12c 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_conv.c +++ b/source/blender/bmesh/intern/bmesh_mesh_conv.c @@ -893,6 +893,10 @@ void BM_mesh_bm_to_me(Main *bmain, BMesh *bm, Mesh *me, const struct BMeshToMesh j = bm_to_mesh_shape_layer_index_from_kb(bm, currkey); cd_shape_offset = CustomData_get_n_offset(&bm->vdata, CD_SHAPEKEY, j); + if (cd_shape_offset < 0) { + /* The target Mesh has more shapekeys than the BMesh. */ + continue; + } fp = newkey = MEM_callocN(me->key->elemsize * bm->totvert, "currkey->data"); oldkey = currkey->data; |