Revision: 21117
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21117
Author: aligorith
Date: 2009-06-24 03:04:01 +0200 (Wed, 24 Jun 2009)
Log Message:
-----------
NLA SoC: Fixing a few cases where the wrong flags got used in last night's
commit
Modified Paths:
--------------
branches/soc-2009-aligorith/source/blender/editors/space_action/action_edit.c
branches/soc-2009-aligorith/source/blender/editors/space_graph/graph_edit.c
Modified:
branches/soc-2009-aligorith/source/blender/editors/space_action/action_edit.c
===================================================================
---
branches/soc-2009-aligorith/source/blender/editors/space_action/action_edit.c
2009-06-23 19:34:07 UTC (rev 21116)
+++
branches/soc-2009-aligorith/source/blender/editors/space_action/action_edit.c
2009-06-24 01:04:01 UTC (rev 21117)
@@ -406,7 +406,7 @@
/* 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;
Modified:
branches/soc-2009-aligorith/source/blender/editors/space_graph/graph_edit.c
===================================================================
--- branches/soc-2009-aligorith/source/blender/editors/space_graph/graph_edit.c
2009-06-23 19:34:07 UTC (rev 21116)
+++ branches/soc-2009-aligorith/source/blender/editors/space_graph/graph_edit.c
2009-06-24 01:04:01 UTC (rev 21117)
@@ -288,7 +288,7 @@
/* 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 @@
/* 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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
