Fix T77584: Edit Mode crash with shape keys created on blank mesh
Entering edit-mode after creating shape keys on a blank mesh would crash.
Regression in 9b9f84b317
which prevented initializing empty
shape keys when there is no shape key offset data available.
This commit is contained in:
parent
4f6e51aa52
commit
39af4d8bfe
Notes:
blender-bot
2023-02-14 10:21:15 +01:00
Referenced by issue #77584, Segfault with bmesh API on a mesh with a shape key
|
@ -884,19 +884,14 @@ void BM_mesh_bm_to_me(Main *bmain, BMesh *bm, Mesh *me, const struct BMeshToMesh
|
|||
}
|
||||
|
||||
for (currkey = me->key->block.first; currkey; currkey = currkey->next) {
|
||||
const bool apply_offset = (ofs && (currkey != actkey) &&
|
||||
(bm->shapenr - 1 == currkey->relative));
|
||||
int cd_shape_offset;
|
||||
int keyi;
|
||||
const float(*ofs_pt)[3] = ofs;
|
||||
float *newkey, (*oldkey)[3], *fp;
|
||||
|
||||
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;
|
||||
}
|
||||
const int cd_shape_offset = CustomData_get_n_offset(&bm->vdata, CD_SHAPEKEY, j);
|
||||
const bool apply_offset = (cd_shape_offset != -1) && (ofs != NULL) && (currkey != actkey) &&
|
||||
(bm->shapenr - 1 == currkey->relative);
|
||||
|
||||
fp = newkey = MEM_callocN(me->key->elemsize * bm->totvert, "currkey->data");
|
||||
oldkey = currkey->data;
|
||||
|
@ -918,7 +913,7 @@ void BM_mesh_bm_to_me(Main *bmain, BMesh *bm, Mesh *me, const struct BMeshToMesh
|
|||
}
|
||||
}
|
||||
}
|
||||
else if (j != -1) {
|
||||
else if (cd_shape_offset != -1) {
|
||||
/* In most cases this runs. */
|
||||
copy_v3_v3(fp, BM_ELEM_CD_GET_VOID_P(eve, cd_shape_offset));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue