From e11601be37a4a6cdf2afa6bffa5d4d0470ed453c Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Fri, 10 Dec 2010 18:48:20 +0000 Subject: [PATCH] Bugfix #25153 graph editor: - option "extend mode" requires channel-selection. Moved pulldown menu from Key to Channel instead - hotkey SHIFT+E for same operation now works both in channel list as in main view. --- release/scripts/ui/space_graph.py | 4 ++-- source/blender/editors/space_graph/graph_ops.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/release/scripts/ui/space_graph.py b/release/scripts/ui/space_graph.py index b3d08ef7c53..79acdd9f9ce 100644 --- a/release/scripts/ui/space_graph.py +++ b/release/scripts/ui/space_graph.py @@ -152,6 +152,7 @@ class GRAPH_MT_channel(bpy.types.Menu): layout.separator() layout.operator("anim.channels_editable_toggle") layout.operator("anim.channels_visibility_set") + layout.operator_menu_enum("graph.extrapolation_type", "type", text="Extrapolation Mode") layout.separator() layout.operator("anim.channels_expand") @@ -187,8 +188,7 @@ class GRAPH_MT_key(bpy.types.Menu): layout.separator() layout.operator_menu_enum("graph.handle_type", "type", text="Handle Type") layout.operator_menu_enum("graph.interpolation_type", "type", text="Interpolation Mode") - layout.operator_menu_enum("graph.extrapolation_type", "type", text="Extrapolation Mode") - + layout.separator() layout.operator("graph.clean") layout.operator("graph.sample") diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c index 97595c9b904..ab28d4d72ea 100644 --- a/source/blender/editors/space_graph/graph_ops.c +++ b/source/blender/editors/space_graph/graph_ops.c @@ -339,8 +339,6 @@ static void graphedit_keymap_keyframes (wmKeyConfig *keyconf, wmKeyMap *keymap) WM_keymap_add_item(keymap, "GRAPH_OT_interpolation_type", TKEY, KM_PRESS, KM_SHIFT, 0); - WM_keymap_add_item(keymap, "GRAPH_OT_extrapolation_type", EKEY, KM_PRESS, KM_SHIFT, 0); - /* destructive */ WM_keymap_add_item(keymap, "GRAPH_OT_clean", OKEY, KM_PRESS, 0, 0); @@ -388,6 +386,8 @@ void graphedit_keymap(wmKeyConfig *keyconf) /* keymap for all regions */ keymap= WM_keymap_find(keyconf, "Graph Editor Generic", SPACE_IPO, 0); WM_keymap_add_item(keymap, "GRAPH_OT_properties", NKEY, KM_PRESS, 0, 0); + /* extrapolation works on channels, not keys */ + WM_keymap_add_item(keymap, "GRAPH_OT_extrapolation_type", EKEY, KM_PRESS, KM_SHIFT, 0); /* channels */ /* Channels are not directly handled by the Graph Editor module, but are inherited from the Animation module.