code cleanup: make shape key api names consistent with our new convention.

1 files changed, 11 insertions, 11 deletions

diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c
index 40b653a62fd..cfd4945688b 100644
--- a/source/blender/editors/object/object_shapekey.c
+++ b/source/blender/editors/object/object_shapekey.c
@@ -78,7 +78,7 @@ static void ED_object_shape_key_add(bContext *C, Scene *scene, Object *ob, int f
 {
 	KeyBlock *kb;
 	if ((kb = BKE_object_insert_shape_key(scene, ob, NULL, from_mix))) {
-		Key *key = ob_get_key(ob);
+		Key *key = BKE_key_from_object(ob);
 		/* for absolute shape keys, new keys may not be added last */
 		ob->shapenr = BLI_findindex(&key->block, kb) + 1;
 
@@ -95,7 +95,7 @@ static int ED_object_shape_key_remove(bContext *C, Object *ob)
 	Key *key;
 	//IpoCurve *icu;
 
-	key = ob_get_key(ob);
+	key = BKE_key_from_object(ob);
 	if (key == NULL)
 		return 0;
 	
@@ -115,14 +115,14 @@ static int ED_object_shape_key_remove(bContext *C, Object *ob)
 				/* apply new basis key on original data */
 				switch (ob->type) {
 					case OB_MESH:
-						key_to_mesh(key->refkey, ob->data);
+						BKE_key_convert_to_mesh(key->refkey, ob->data);
 						break;
 					case OB_CURVE:
 					case OB_SURF:
-						key_to_curve(key->refkey, ob->data, BKE_curve_nurbs_get(ob->data));
+						BKE_key_convert_to_curve(key->refkey, ob->data, BKE_curve_nurbs_get(ob->data));
 						break;
 					case OB_LATTICE:
-						key_to_latt(key->refkey, ob->data);
+						BKE_key_convert_to_lattice(key->refkey, ob->data);
 						break;
 				}
 			}
@@ -155,7 +155,7 @@ static int object_shape_key_mirror(bContext *C, Object *ob)
 	KeyBlock *kb;
 	Key *key;
 
-	key = ob_get_key(ob);
+	key = BKE_key_from_object(ob);
 	if (key == NULL)
 		return 0;
 	
@@ -323,8 +323,8 @@ void OBJECT_OT_shape_key_remove(wmOperatorType *ot)
 static int shape_key_clear_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Object *ob = ED_object_context(C);
-	Key *key = ob_get_key(ob);
-	KeyBlock *kb = ob_get_keyblock(ob);
+	Key *key = BKE_key_from_object(ob);
+	KeyBlock *kb = BKE_keyblock_from_object(ob);
 
 	if (!key || !kb)
 		return OPERATOR_CANCELLED;
@@ -357,8 +357,8 @@ void OBJECT_OT_shape_key_clear(wmOperatorType *ot)
 static int shape_key_retime_exec(bContext *C, wmOperator *UNUSED(op))
 {
 	Object *ob = ED_object_context(C);
-	Key *key = ob_get_key(ob);
-	KeyBlock *kb = ob_get_keyblock(ob);
+	Key *key = BKE_key_from_object(ob);
+	KeyBlock *kb = BKE_keyblock_from_object(ob);
 	float cfra = 0.0f;
 
 	if (!key || !kb)
@@ -419,7 +419,7 @@ static int shape_key_move_exec(bContext *C, wmOperator *op)
 	Object *ob = ED_object_context(C);
 
 	int type = RNA_enum_get(op->ptr, "type");
-	Key *key = ob_get_key(ob);
+	Key *key = BKE_key_from_object(ob);
 
 	if (key) {
 		KeyBlock *kb, *kb_other;