== IPO Editor ==

Inser Keyframe on Current Frame now takes NLA/IPO scaling into account.

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 */