archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Bugfixes:

Browse Source 
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)
This commit is contained in:
Joshua Leung
2010-02-12 11:48:55 +00:00
parent 912fdcacab
commit bd88fb372f
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/animation/anim_channels_defines.c
View File

@@ -386,7 +386,10 @@ static short acf_generic_dataexpand_setting_valid(bAnimContext *ac, bAnimListEle
static void acf_summary_color(bAnimContext *ac, bAnimListElem *ale, float *color) static void acf_summary_color(bAnimContext *ac, bAnimListElem *ale, float *color)
{ {
// FIXME: hardcoded color - same as the 'action' line in NLA // FIXME: hardcoded color - same as the 'action' line in NLA
glColor3f(0.8f, 0.2f, 0.0f); // reddish color // reddish color
color[0] = 0.8f;
color[1] = 0.2f;
color[2] = 0.0f;
} }
/* backdrop for summary widget */ /* backdrop for summary widget */

2
source/blender/editors/interface/view2d_ops.c
View File

@@ -1604,6 +1604,7 @@ void UI_view2d_keymap(wmKeyConfig *keyconf)
WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_left", WHEELUPMOUSE, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_left", WHEELUPMOUSE, KM_PRESS, 0, 0);
/* alternatives for page up/down to scroll */ /* 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 */ /* 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_down", PAGEDOWNKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_up", PAGEUPKEY, 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 */ /* 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_right", PAGEDOWNKEY, KM_PRESS, KM_SHIFT, 0);
WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_left", PAGEUPKEY, KM_PRESS, KM_SHIFT, 0); WM_keymap_add_item(keymap, "VIEW2D_OT_scroll_left", PAGEUPKEY, KM_PRESS, KM_SHIFT, 0);
#endif
/* zoom - drag */ /* zoom - drag */
WM_keymap_add_item(keymap, "VIEW2D_OT_zoom", MIDDLEMOUSE, KM_PRESS, KM_CTRL, 0); WM_keymap_add_item(keymap, "VIEW2D_OT_zoom", MIDDLEMOUSE, KM_PRESS, KM_CTRL, 0);