Bugfixes:
authorJoshua Leung <aligorith@gmail.com>
Fri, 12 Feb 2010 11:48:55 +0000 (11:48 +0000)
committerJoshua Leung <aligorith@gmail.com>
Fri, 12 Feb 2010 11:48:55 +0000 (11:48 +0000)
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)

source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/interface/view2d_ops.c

index 19d1dcac1da852cd9561eba2af8e6d8cbd78542c..6fb933214e583cee53c6e83d13db0ff8e79d234e 100644 (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)
 {
        // 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 */
index 8cc0d6a545c7b650c6244eaac0a2d7cc6ac1a155..a275793eb0e7405c561ea94aa81eeb57a7c9c8ee 100644 (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);
        
        /* 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);