From d526ef607d0a8741799ede335c2c64dc87e4f094 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Sun, 16 Nov 2014 19:15:23 +0100 Subject: Cleanup: rename `BKE_key_convert/update` to `BKE_keyblock_convert/update`. We are handling a keyblock here, not a whole key(set). Names are alreay a bit confusing, let's be consistent at least. --- source/blender/editors/object/object_shapekey.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/object/object_shapekey.c') diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index b9c8ab1e35f..6bb23a4a7f0 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -133,14 +133,14 @@ static bool ED_object_shape_key_remove(Main *bmain, Object *ob) /* apply new basis key on original data */ switch (ob->type) { case OB_MESH: - BKE_key_convert_to_mesh(key->refkey, ob->data); + BKE_keyblock_convert_to_mesh(key->refkey, ob->data); break; case OB_CURVE: case OB_SURF: - BKE_key_convert_to_curve(key->refkey, ob->data, BKE_curve_nurbs_get(ob->data)); + BKE_keyblock_convert_to_curve(key->refkey, ob->data, BKE_curve_nurbs_get(ob->data)); break; case OB_LATTICE: - BKE_key_convert_to_lattice(key->refkey, ob->data); + BKE_keyblock_convert_to_lattice(key->refkey, ob->data); break; } } -- cgit v1.2.3