griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

NLA SoC: Fixing a few cases where the wrong flags got used in last night's commit

Browse Source
This commit is contained in:
Joshua Leung
2009-06-24 01:04:01 +00:00
parent b4acd77526
commit 0336c2e7f5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_action/action_edit.c
View File

@@ -406,7 +406,7 @@ static void insert_action_keys(bAnimContext *ac, short mode)
/* adjust current frame for NLA-scaling */
if (adt)
cfra= BKE_nla_tweakedit_remap(adt, (float)CFRA, 1);
cfra= BKE_nla_tweakedit_remap(adt, (float)CFRA, 0);
else
cfra= (float)CFRA;

4
source/blender/editors/space_graph/graph_edit.c
View File

@@ -288,7 +288,7 @@ static void create_ghost_curves (bAnimContext *ac, int start, int end)
/* use the sampling callback at 1-frame intervals from start to end frames */
for (cfra= start; cfra <= end; cfra++, fpt++) {
float cfrae= BKE_nla_tweakedit_remap(adt, cfra, 1);
float cfrae= BKE_nla_tweakedit_remap(adt, cfra, 0);
fpt->vec[0]= cfrae;
fpt->vec[1]= fcurve_samplingcb_evalcurve(fcu, NULL, cfrae);
@@ -427,7 +427,7 @@ static int graphkeys_click_insert_exec (bContext *C, wmOperator *op)
/* apply inverse NLA-mapping to frame to get correct time in un-scaled action */
adt= ANIM_nla_mapping_get(&ac, ale);
frame= BKE_nla_tweakedit_remap(adt, frame, 1);
frame= BKE_nla_tweakedit_remap(adt, frame, 0);
/* insert keyframe on the specified frame + value */
insert_vert_fcurve((FCurve *)ale->data, frame, val, 0);