diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-19 14:12:07 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-19 14:12:07 +0400 |
| commit | 0d5d2146ebc026c254fc68e4970a1dfb3a9b5b31 (patch) | |
| tree | 1182edf4d10ae0dd65fde371d46be6baf9435b25 /source/blender/editors/animation | |
| parent | f5d3e361cec686fe90faba9c8bc1681b595243b3 (diff) | |
code cleanup: make shape key api names consistent with our new convention.
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_channels_defines.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/animation/anim_filter.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/animation/keyframing.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 3f42f7e962b..1998dafb3cd 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -3196,7 +3196,7 @@ static void achannel_setting_slider_shapekey_cb(bContext *C, void *key_poin, voi { Key *key = (Key *)key_poin; KeyBlock *kb = (KeyBlock *)kb_poin; - char *rna_path = key_get_curValue_rnaPath(key, kb); + char *rna_path = BKE_keyblock_curval_rnapath_get(key, kb); ReportList *reports = CTX_wm_reports(C); Scene *scene = CTX_data_scene(C); @@ -3503,7 +3503,7 @@ void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale KeyBlock *kb = (KeyBlock *)ale->data; Key *key = (Key *)ale->id; - rna_path = key_get_curValue_rnaPath(key, kb); + rna_path = BKE_keyblock_curval_rnapath_get(key, kb); free_path = 1; } diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index c246eb0cdf0..8b0593d48ac 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -99,7 +99,7 @@ /* ----------- Private Stuff - Action Editor ------------- */ /* Get shapekey data being edited (for Action Editor -> ShapeKey mode) */ -/* Note: there's a similar function in key.c (ob_get_key) */ +/* Note: there's a similar function in key.c (BKE_key_from_object) */ static Key *actedit_get_shapekeys(bAnimContext *ac) { Scene *scene = ac->scene; @@ -114,7 +114,7 @@ static Key *actedit_get_shapekeys(bAnimContext *ac) //if (saction->pin) return NULL; /* shapekey data is stored with geometry data */ - key = ob_get_key(ob); + key = BKE_key_from_object(ob); if (key) { if (key->type == KEY_RELATIVE) @@ -799,7 +799,7 @@ static bAnimListElem *make_new_animlistelem(void *data, short datatype, ID *owne /* the corresponding keyframes are from the animdata */ if (ale->adt && ale->adt->action) { bAction *act = ale->adt->action; - char *rna_path = key_get_curValue_rnaPath(key, kb); + char *rna_path = BKE_keyblock_curval_rnapath_get(key, kb); /* try to find the F-Curve which corresponds to this exactly, * then free the MEM_alloc'd string @@ -1940,7 +1940,7 @@ static size_t animdata_filter_dopesheet_ob(bAnimContext *ac, ListBase *anim_data /* filter data contained under object first */ BEGIN_ANIMFILTER_SUBCHANNELS(EXPANDED_OBJC(ob)) { - Key *key = ob_get_key(ob); + Key *key = BKE_key_from_object(ob); /* object-level animation */ if ((ob->adt) && !(ads->filterflag & ADS_FILTER_NOOBJ)) { diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 5e0459bea90..1791d84d90b 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -1836,7 +1836,7 @@ static short object_frame_has_keyframe(Object *ob, float frame, short filter) /* try shapekey keyframes (if available, and allowed by filter) */ if (!(filter & ANIMFILTER_KEYS_LOCAL) && !(filter & ANIMFILTER_KEYS_NOSKEY) ) { - Key *key = ob_get_key(ob); + Key *key = BKE_key_from_object(ob); /* shapekeys can have keyframes ('Relative Shape Keys') * or depend on time (old 'Absolute Shape Keys') |