From 59016f9f5da298568f0d7c1a9af98b03aa6477ad Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Wed, 22 Aug 2007 08:52:57 +0000 Subject: Bugfix #7083: The menu entries for changing Interpolation and Extrapolation modes in the Action Editor weren't working properly (at all). --- source/blender/src/header_action.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'source/blender/src/header_action.c') diff --git a/source/blender/src/header_action.c b/source/blender/src/header_action.c index 4072dd042b4..1c34bdbaeaf 100644 --- a/source/blender/src/header_action.c +++ b/source/blender/src/header_action.c @@ -682,13 +682,13 @@ static void do_action_keymenu_intpolmenu(void *arg, int event) switch(event) { case ACTMENU_KEY_INTERP_CONST: - action_set_ipo_flags(SET_IPO_CONSTANT); + action_set_ipo_flags(SET_IPO_MENU, SET_IPO_CONSTANT); break; case ACTMENU_KEY_INTERP_LINEAR: - action_set_ipo_flags(SET_IPO_LINEAR); + action_set_ipo_flags(SET_IPO_MENU, SET_IPO_LINEAR); break; case ACTMENU_KEY_INTERP_BEZIER: - action_set_ipo_flags(SET_IPO_BEZIER); + action_set_ipo_flags(SET_IPO_MENU, SET_IPO_BEZIER); break; } @@ -705,15 +705,15 @@ static uiBlock *action_keymenu_intpolmenu(void *arg_unused) uiBlockSetButmFunc(block, do_action_keymenu_intpolmenu, NULL); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, - "Constant", 0, yco-=20, + "Constant|Shift T, 1", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, ACTMENU_KEY_INTERP_CONST, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, - "Linear", 0, yco-=20, + "Linear|Shift T, 2", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, ACTMENU_KEY_INTERP_LINEAR, ""); uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, - "Bezier", 0, yco-=20, + "Bezier|Shift T, 3", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, ACTMENU_KEY_INTERP_BEZIER, ""); @@ -728,16 +728,16 @@ static void do_action_keymenu_extendmenu(void *arg, int event) switch(event) { case ACTMENU_KEY_EXTEND_CONST: - action_set_ipo_flags(SET_EXTEND_CONSTANT); + action_set_ipo_flags(SET_EXTEND_MENU, SET_EXTEND_CONSTANT); break; case ACTMENU_KEY_EXTEND_EXTRAPOLATION: - action_set_ipo_flags(SET_EXTEND_EXTRAPOLATION); + action_set_ipo_flags(SET_EXTEND_MENU, SET_EXTEND_EXTRAPOLATION); break; case ACTMENU_KEY_EXTEND_CYCLIC: - action_set_ipo_flags(SET_EXTEND_CYCLIC); + action_set_ipo_flags(SET_EXTEND_MENU, SET_EXTEND_CYCLIC); break; case ACTMENU_KEY_EXTEND_CYCLICEXTRAPOLATION: - action_set_ipo_flags(SET_EXTEND_CYCLICEXTRAPOLATION); + action_set_ipo_flags(SET_EXTEND_MENU, SET_EXTEND_CYCLICEXTRAPOLATION); break; } -- cgit v1.2.3