diff options
| author | Joshua Leung <aligorith@gmail.com> | 2010-02-12 14:48:55 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2010-02-12 14:48:55 +0300 |
| commit | bd88fb372f830b8250a35ecd6cb25fe194f7683b (patch) | |
| tree | ee7b66a18e8c04e85d174269c44ac595b14aac3f /source/blender/editors/interface/view2d_ops.c | |
| parent | 912fdcacab3bcfb927696f92b4b36bb53452c6f2 (diff) | |
Bugfixes:
1) Summary channel in DopeSheet was using uninitialised color for backdrop, resulting in weird/wrong colours
2) Commented out the view2d hotkeys added earlier, since they currently cause some conflicts for animation editor hotkeys (namely NLA)
Diffstat (limited to 'source/blender/editors/interface/view2d_ops.c')
| -rw-r--r-- | source/blender/editors/interface/view2d_ops.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index 8cc0d6a545c..a275793eb0e 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -1604,6 +1604,7 @@ void UI_view2d_keymap(wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_left", WHEELUPMOUSE, KM_PRESS, 0, 0); /* alternatives for page up/down to scroll */ +#if 0 // XXX disabled, since this causes conflicts with hotkeys in animation editors /* scroll up/down may fall through to left/right */ WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_down", PAGEDOWNKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_up", PAGEUPKEY, KM_PRESS, 0, 0); @@ -1612,6 +1613,7 @@ void UI_view2d_keymap(wmKeyConfig *keyconf) /* shift for moving view left/right with page up/down */ WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_right", PAGEDOWNKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_left", PAGEUPKEY, KM_PRESS, KM_SHIFT, 0); +#endif /* zoom - drag */ WM_keymap_add_item(keymap, "VIEW2D_OT_zoom", MIDDLEMOUSE, KM_PRESS, KM_CTRL, 0); |