At last... this merge should finally do the trick!
[blender.git] / source / blender / editors / space_action / action_edit.c
index 272ef3222ceaede681ed110a1a0744d7cbfe2dae..61dbc41e7c8c2fd4cb8a1d70b2f7982bb7289215 100644 (file)
@@ -1,5 +1,5 @@
 /**
- * $Id: editaction.c 17746 2008-12-08 11:19:44Z aligorith $
+ * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -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;