[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26837] trunk/blender/source/blender/ editors: Bugfixes:

[Joshua Leung]

Revision: 26837
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26837
Author:   aligorith
Date:     2010-02-12 12:48:55 +0100 (Fri, 12 Feb 2010)

Log Message:
-----------
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)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/anim_channels_defines.c
    trunk/blender/source/blender/editors/interface/view2d_ops.c

Modified: trunk/blender/source/blender/editors/animation/anim_channels_defines.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_channels_defines.c	2010-02-12 11:34:25 UTC (rev 26836)
+++ trunk/blender/source/blender/editors/animation/anim_channels_defines.c	2010-02-12 11:48:55 UTC (rev 26837)
@@ -386,7 +386,10 @@
 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 */

Modified: trunk/blender/source/blender/editors/interface/view2d_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/view2d_ops.c	2010-02-12 11:34:25 UTC (rev 26836)
+++ trunk/blender/source/blender/editors/interface/view2d_ops.c	2010-02-12 11:48:55 UTC (rev 26837)
@@ -1604,6 +1604,7 @@
 	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 @@
 		/* 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);