diff options
author | Joshua Leung <aligorith@gmail.com> | 2007-04-29 07:35:39 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2007-04-29 07:35:39 +0400 |
commit | e4d6f331eb90f7375a241a7698bd6958b6ced326 (patch) | |
tree | d058532c8ebf163a14a6895cc0082cc76f886fa6 /source/blender/src | |
parent | acce32138266550f1647aff3491066f646c00e88 (diff) |
== IPO Editor ==
Inser Keyframe on Current Frame now takes NLA/IPO scaling into account.
Diffstat (limited to 'source/blender/src')
-rw-r--r-- | source/blender/src/editipo.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/src/editipo.c b/source/blender/src/editipo.c index 75ff319fb53..76c248e4f5f 100644 --- a/source/blender/src/editipo.c +++ b/source/blender/src/editipo.c @@ -2367,6 +2367,13 @@ void insertkey_editipo(void) cfra= (float)(100.0*(cfra-last_seq->startdisp)/((float)(last_seq->enddisp-last_seq->startdisp))); } } + + /* convert cfra to ipo-time */ + if (OBACT && OBACT->action && G.sipo->pin==0) { + if (G.sipo->actname || G.sipo->constname) { + cfra= get_action_frame(OBACT, cfra); + } + } insertvals= MEM_mallocN(sizeof(float)*2*tot, "insertkey_editipo"); /* make sure icu->curval is correct */ |