bmesh shape key conversion.

- remove print for impossible error.
- add NULL check incase bmesh and mesh get out of sync (would crash if Basis key-block couldn't be found).
This commit is contained in:
Campbell Barton
2012-04-12 11:27:50 +00:00
parent 115e762556
commit ca8fd669a4

View File

@@ -198,9 +198,6 @@ void BM_mesh_bm_from_me(BMesh *bm, Mesh *me, int set_key, int act_key_nr)
bm->vdata.layers[j].uid = block->uid;
}
}
else if (actkey) {
printf("shapekey <-> mesh mismatch!\n");
}
CustomData_bmesh_init_pool(&bm->vdata, me->totvert, BM_VERT);
CustomData_bmesh_init_pool(&bm->edata, me->totedge, BM_EDGE);
@@ -764,7 +761,11 @@ void BM_mesh_bm_to_me(BMesh *bm, Mesh *me, int dotess)
/* editing the base key should update others */
if (me->key->type == KEY_RELATIVE && oldverts) {
if ((me->key->type == KEY_RELATIVE) && /* only need offsets for relative shape keys */
(actkey != NULL) && /* unlikely, but the active key may not be valid if the
* bmesh and the mesh are out of sync */
(oldverts != NULL)) /* not used here, but 'oldverts' is used later for applyig 'ofs' */
{
int act_is_basis = FALSE;
/* find if this key is a basis for any others */