diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-01-12 06:41:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-01-12 06:41:12 +0300 |
| commit | 63018144badeb10c858504c918a3f66047c068b0 (patch) | |
| tree | 5982ba549aa3e23a68a412877f51d100ae1bb920 /source/blender/editors/space_action/action_edit.c | |
| parent | 21fc4cabaff9b1caa476af9d700195fb239a07c6 (diff) | |
remove redundant assignments & unused vars.
also minor functional changes
- OBJECT_OT_make_links_data() type property is now assigned to the operator property (so popup menu can find it)
- removing BG image now returns cancelled if no image is removed.
Diffstat (limited to 'source/blender/editors/space_action/action_edit.c')
| -rw-r--r-- | source/blender/editors/space_action/action_edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c index 825b462c08f..4719c10e941 100644 --- a/source/blender/editors/space_action/action_edit.c +++ b/source/blender/editors/space_action/action_edit.c @@ -442,7 +442,6 @@ static void insert_action_keys(bAnimContext *ac, short mode) ReportList *reports = ac->reports; Scene *scene= ac->scene; - float cfra= (float)CFRA; short flag = 0; /* filter data */ @@ -459,7 +458,8 @@ static void insert_action_keys(bAnimContext *ac, short mode) for (ale= anim_data.first; ale; ale= ale->next) { AnimData *adt= ANIM_nla_mapping_get(ac, ale); FCurve *fcu= (FCurve *)ale->key_data; - + float cfra; + /* adjust current frame for NLA-scaling */ if (adt) cfra= BKE_nla_tweakedit_remap(adt, (float)CFRA, NLATIME_CONVERT_UNMAP); |