Support for using the action window as a tool for modifying

(mesh or lattice) RVK IpoCurves: support currently includes:

	- RVK sliders. Pressing the little triangle next to
	  the word 'sliders' in the channel names opens them up.
	- NKEY in the area where the key block names are allows the
	  user to change the name of the keyblock, and the max and min
	  values of the RVK sliders.
	- ability to visualize the keyframes for the IpoCurves when
	  the object is selected.
	- right mouse can be used to select the keys
	- border select in the main area can be used to border
	  select keys.
	- AKEY selects/deselects all of the keys
	- GKEY and SKEY can be used to grab or scale the key
	  selections.
	- XKEY deletes the selected keys.
	- DKEY duplicated the selected keys.
	- VKEY, HKEY and shift-HKEY change the bezier handles for
	  the selected keys.

Please, please, please test!

1 files changed, 390 insertions, 85 deletions

diff --git a/source/blender/src/drawaction.c b/source/blender/src/drawaction.c
index 80af4d27676..482fb4448e6 100644
--- a/source/blender/src/drawaction.c
+++ b/source/blender/src/drawaction.c
@@ -60,6 +60,8 @@
 #include "DNA_scene_types.h"
 #include "DNA_space_types.h"
 #include "DNA_constraint_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_key_types.h"
 
 #include "BKE_action.h"
 #include "BKE_global.h"
@@ -76,12 +78,17 @@
 #include "BDR_editcurve.h"
 #include "BSE_view.h"
 #include "BSE_drawipo.h"
+#include "BSE_editaction.h"
 #include "BSE_editaction_types.h"
 #include "BDR_drawaction.h"
 
 /* 'old' stuff": defines and types, and own include -------------------- */
 
 #include "blendef.h"
+#include "interface.h"
+#include "mydevice.h"
+
+#include "BKE_ipo.h"
 
 /* local functions ----------------------------------------------------- */
 void drawactionspace(ScrArea *sa, void *spacedata);
@@ -91,10 +98,93 @@ int count_action_levels(bAction *act);
 static BezTriple **ipo_to_keylist(Ipo *ipo, int flags, int *totvert);
 static BezTriple **action_to_keylist(bAction *act, int flags, int *totvert);
 static BezTriple **ob_to_keylist(Object *ob, int flags, int *totvert);
+static BezTriple **icu_to_keylist(IpoCurve *icu, int flags, int *totvert);
 static void draw_keylist(gla2DDrawInfo *di, int totvert, BezTriple **blist, float ypos);
-
+void draw_icu_channel(gla2DDrawInfo *di, IpoCurve *icu, int flags, float ypos);
+static void draw_action_mesh_names(Key *key);
 
 /* implementation ------------------------------------------------------ */
+
+extern void make_rvk_slider(uiBlock *block, Key *key, int i,
+							int x, int y, int w, int h); /* editkey.c */
+extern short showsliders; /* editaction .c */
+extern short ACTWIDTH;
+
+void meshactionbuts(SpaceAction *saction, Key *key)
+{
+	int           i;
+	char          str[64];
+	char          keyname[32];
+	float	        x, y, ybase;
+	uiBlock       *block;
+	uiBut         *but;
+    short ofsx, ofsy = 0; 
+#define RVKBGCOL .6, .6, .8
+#define XIC 20
+#define YIC 20
+
+	/* lets make the rvk sliders */
+
+	/* reset the damn myortho2 or the sliders won't draw/redraw
+	 * correctly *grumble*
+	 */
+	mywinset(curarea->win);
+	myortho2(-0.5, curarea->winx+0.5, -0.5, curarea->winy+0.5);
+
+    sprintf(str, "actionbuttonswin %d", curarea->win);
+    block= uiNewBlock (&curarea->uiblocks, str, 
+                       UI_EMBOSSX, UI_HELV, curarea->win);
+
+	x = NAMEWIDTH + 1;
+    y = key->totkey*(CHANNELHEIGHT+CHANNELSKIP) 
+	  - CHANNELHEIGHT/2  - G.v2d->cur.ymin;
+
+    uiBlockSetCol(block, BUTPURPLE);
+
+	/* make the little 'open the sliders' widget */
+    glColor3f(RVKBGCOL); 
+	glRects(2,            y + 2*CHANNELHEIGHT - 2,  
+			ACTWIDTH - 2, y + CHANNELHEIGHT + 2);
+	glColor3ub(0, 0, 0);
+	glRasterPos2f(4, y + CHANNELHEIGHT + 6);
+	BMF_DrawString(G.font, "Sliders");
+
+	uiBlockSetEmboss(block, UI_EMBOSSN);
+
+	if (!showsliders) {
+		ACTWIDTH = NAMEWIDTH;
+		uiDefIconButS(block, TOG, B_FLIPINFOMENU, 
+					  ICON_DISCLOSURE_TRI_RIGHT,
+					  NAMEWIDTH - XIC - 5, y + CHANNELHEIGHT,
+					  XIC,YIC-2,
+					  &(showsliders), 0, 0, 0, 0, 
+					  "Show action window sliders");
+	}
+	else {
+		uiDefIconButS(block, TOG, B_FLIPINFOMENU, 
+					  ICON_DISCLOSURE_TRI_DOWN,
+					  NAMEWIDTH - XIC - 5, y + CHANNELHEIGHT,
+					  XIC,YIC-2,
+					  &(showsliders), 0, 0, 0, 0, 
+					  "Hide action window sliders");
+		ACTWIDTH = NAMEWIDTH + SLIDERWIDTH;
+
+		/* sliders are open so draw them */
+		glColor3f(RVKBGCOL); 
+		glRects(NAMEWIDTH,  0,  NAMEWIDTH+SLIDERWIDTH,  curarea->winy);
+		uiBlockSetEmboss(block, UI_EMBOSSX);
+		for (i=1 ; i < key->totkey ; ++ i) {
+			make_rvk_slider(block, key, i, 
+							x, y, SLIDERWIDTH-2, CHANNELHEIGHT-1);
+
+			y-=CHANNELHEIGHT+CHANNELSKIP;
+			
+		}
+	}
+	uiDrawBlock(block);
+
+}
+
 void draw_cfra_action(void)
 {
 	Object *ob;
@@ -129,24 +219,105 @@ void draw_cfra_action(void)
 	glLineWidth(1.0);
 }
 
+
+static void draw_action_channel_names(bAction	*act) {
+    bActionChannel *chan;
+    bConstraintChannel *conchan;
+    float	x, y;
+
+    x = 0.0;
+		y= count_action_levels(act)*(CHANNELHEIGHT+CHANNELSKIP);
+
+		for (chan=act->chanbase.first; chan; chan=chan->next){
+        glColor3ub(0xAA, 0xAA, 0xAA);
+        glRectf(x,  y-CHANNELHEIGHT/2,  (float)NAMEWIDTH,  y+CHANNELHEIGHT/2);
+
+        if (chan->flag & ACHAN_SELECTED)
+            glColor3ub(255, 255, 255);
+        else
+            glColor3ub(0, 0, 0);
+        glRasterPos2f(x+8,  y-4);
+        BMF_DrawString(G.font, chan->name);
+        y-=CHANNELHEIGHT+CHANNELSKIP;
+
+        /* Draw constraint channels */
+        for (conchan=chan->constraintChannels.first; 
+             conchan; conchan=conchan->next){
+            if (conchan->flag & CONSTRAINT_CHANNEL_SELECT)
+                glColor3ub(255, 255, 255);
+            else
+                glColor3ub(0, 0, 0);
+				
+            glRasterPos2f(x+32,  y-4);
+            BMF_DrawString(G.font, conchan->name);
+            y-=CHANNELHEIGHT+CHANNELSKIP;
+        }
+		}
+}
+
+
+static void draw_action_mesh_names(Key *key) {
+	/* draws the names of the rvk keys in the
+	 * left side of the action window
+	 */
+	int	     i;
+	char     keyname[32];
+	float    x, y;
+	KeyBlock *kb;
+
+	x = 0.0;
+	y= key->totkey*(CHANNELHEIGHT+CHANNELSKIP);
+
+	kb= key->block.first;
+
+	for (i=1 ; i < key->totkey ; ++ i) {
+		glColor3ub(0xAA, 0xAA, 0xAA);
+		glRectf(x,	y-CHANNELHEIGHT/2,	(float)NAMEWIDTH,  y+CHANNELHEIGHT/2);
+
+		glColor3ub(0, 0, 0);
+
+		glRasterPos2f(x+8,	y-4);
+		kb = kb->next;
+		/* Blender now has support for named
+		 * key blocks. If a name hasn't
+		 * been set for an key block then
+		 * just display the key number -- 
+		 * otherwise display the name stored
+		 * in the keyblock.
+		 */
+		if (kb->name[0] == '\0') {
+		  sprintf(keyname, "Key %d", i);
+		  BMF_DrawString(G.font, keyname);
+		}
+		else {
+		  BMF_DrawString(G.font, kb->name);
+		}
+
+		y-=CHANNELHEIGHT+CHANNELSKIP;
+
+	}
+}
+
 static void draw_channel_names(void) 
 {
 	short ofsx, ofsy = 0; 
-
+	float y;
 	bAction	*act;
-	bActionChannel *chan;
-	bConstraintChannel *conchan;
-	float	x, y;
-	
-	myortho2		(0,	ACTWIDTH, G.v2d->cur.ymin, G.v2d->cur.ymax);	//	Scaling
+	Key *key;
+
+	myortho2		(0,	NAMEWIDTH, G.v2d->cur.ymin, G.v2d->cur.ymax);	//	Scaling
 
 	/* Blank out the area */
 	if(curarea->winx>SCROLLB+10 && curarea->winy>SCROLLH+10) {
 		if(G.v2d->scroll) {	
 			ofsx= curarea->winrct.xmin;	
 			ofsy= curarea->winrct.ymin;
-			glViewport(ofsx,  ofsy+G.v2d->mask.ymin-SCROLLB, ACTWIDTH, ( ofsy+G.v2d->mask.ymax)-( ofsy+G.v2d->mask.ymin-SCROLLB)); 
-			glScissor(ofsx,  ofsy+G.v2d->mask.ymin-SCROLLB, ACTWIDTH, ( ofsy+G.v2d->mask.ymax)-( ofsy+G.v2d->mask.ymin-SCROLLB));
+			glViewport(ofsx,  ofsy+G.v2d->mask.ymin-SCROLLB, NAMEWIDTH, 
+					   (ofsy+G.v2d->mask.ymax) -
+					   (ofsy+G.v2d->mask.ymin-SCROLLB)); 
+			glScissor(ofsx,	 ofsy+G.v2d->mask.ymin-SCROLLB, NAMEWIDTH, 
+					  (ofsy+G.v2d->mask.ymax) -
+					  (ofsy+G.v2d->mask.ymin-SCROLLB));
 		}
 	}
 	
@@ -158,76 +329,67 @@ static void draw_channel_names(void)
 	glColor3ub(0x00, 0x00, 0x00);
 
 	act=G.saction->action;
-	x = 0.0;
-
-	if (act) {		
-		y= count_action_levels(act)*(CHANNELHEIGHT+CHANNELSKIP);
-
-		for (chan=act->chanbase.first; chan; chan=chan->next){
-			glColor3ub(0xAA, 0xAA, 0xAA);
-			glRectf(x,  y-CHANNELHEIGHT/2,  (float)ACTWIDTH,  y+CHANNELHEIGHT/2);
-
-			if (chan->flag & ACHAN_SELECTED)
-				glColor3ub(255, 255, 255);
-			else
-				glColor3ub(0, 0, 0);
-			glRasterPos2f(x+8,  y-4);
-			BMF_DrawString(G.font, chan->name);
-			y-=CHANNELHEIGHT+CHANNELSKIP;
-
-			/* Draw constraint channels */
-			for (conchan=chan->constraintChannels.first; conchan; conchan=conchan->next){
-				if (conchan->flag & CONSTRAINT_CHANNEL_SELECT)
-					glColor3ub(255, 255, 255);
-				else
-					glColor3ub(0, 0, 0);
-				
-				glRasterPos2f(x+32,  y-4);
-				BMF_DrawString(G.font, conchan->name);
-				y-=CHANNELHEIGHT+CHANNELSKIP;
-			}
-		}
-	}
 	
-
-	myortho2		(0,	ACTWIDTH, 0, ( ofsy+G.v2d->mask.ymax)-( ofsy+G.v2d->mask.ymin-SCROLLB));	//	Scaling
-
-	glShadeModel(GL_SMOOTH);
+	
+	if (act) {
+		/* if there is a selected action then
+		 * draw the channel names
+		 */
+		draw_action_channel_names(act);
+	}
+	else {
+	    if ( (key = get_action_mesh_key()) ) {
+            /* if there is a mesh selected with rvk's,
+             * then draw the RVK names
+             */
+            draw_action_mesh_names(key);
+        }
+    }
+
+    myortho2 (0,	NAMEWIDTH, 0, 
+              (ofsy+G.v2d->mask.ymax) -
+              (ofsy+G.v2d->mask.ymin-SCROLLB));	//	Scaling
+
+    glShadeModel(GL_SMOOTH);
  
-	y=9;
-
-	/* Draw sexy shaded block thingies */
-	glEnable (GL_BLEND);
-	glBegin(GL_QUAD_STRIP);
-	glColor4ub (0xCC,0xCC,0xCC,0x00);
-	glVertex2f (0,SCROLLB*2-y);
-	glVertex2f (ACTWIDTH,SCROLLB*2-y);
-
-	glColor4ub (0xCC,0xCC,0xCC,0xFF);
-	glVertex2f (0,SCROLLB-y);
-	glVertex2f (ACTWIDTH,SCROLLB-y);
-
-	glColor4ub (0xCC,0xCC,0xCC,0xFF);
-	glVertex2f (0,0-y);
-	glVertex2f (ACTWIDTH,0-y);
-
-	glEnd();
-
-/*	y=( ofsy+G.v2d->mask.ymax)-( ofsy+G.v2d->mask.ymin-SCROLLB);
-
-	glBegin(GL_QUAD_STRIP);
-	glColor4ub (0x88,0x88,0x88,0xFF);
-	glVertex2f (0,y);
-	glVertex2f (ACTWIDTH,y);
-	glColor4ub (0x88,0x88,0x88,0x00);
-	glVertex2f (0,y-SCROLLB);
-	glVertex2f (ACTWIDTH,y-SCROLLB);
+    y=9;
+
+    /* Draw sexy shaded block thingies
+	   Reevan: if you start developing this stuff again
+	   you can have your blend's back
+	   
+    glEnable (GL_BLEND);
+    glBegin(GL_QUAD_STRIP);
+    glColor4ub (0xCC,0xCC,0xCC,0x00);
+    glVertex2f (0,SCROLLB*2-y);
+    glVertex2f (NAMEWIDTH,SCROLLB*2-y);
+
+    glColor4ub (0xCC,0xCC,0xCC,0xFF);
+    glVertex2f (0,SCROLLB-y);
+    glVertex2f (NAMEWIDTH,SCROLLB-y);
+
+    glColor4ub (0xCC,0xCC,0xCC,0xFF);
+    glVertex2f (0,0-y);
+    glVertex2f (NAMEWIDTH,0-y);
+
+    glEnd();
+	*/
+
+    /*	y=( ofsy+G.v2d->mask.ymax)-( ofsy+G.v2d->mask.ymin-SCROLLB);
+
+        glBegin(GL_QUAD_STRIP);
+        glColor4ub (0x88,0x88,0x88,0xFF);
+        glVertex2f (0,y);
+        glVertex2f (NAMEWIDTH,y);
+        glColor4ub (0x88,0x88,0x88,0x00);
+        glVertex2f (0,y-SCROLLB);
+        glVertex2f (NAMEWIDTH,y-SCROLLB);
 	
-	glEnd();
-*/
-	glDisable (GL_BLEND);
+        glEnd();
+    */
+    glDisable (GL_BLEND);
 
-	glShadeModel(GL_FLAT);
+    glShadeModel(GL_FLAT);
 
 }
 
@@ -345,21 +507,96 @@ static void draw_channel_strips(SpaceAction *saction)
 	glaEnd2DDraw(di);
 }
 
+static void draw_mesh_strips(SpaceAction *saction, Key *key)
+{
+	/* draw the RVK keyframes as those little square button things
+	 */
+	rcti scr_rct;
+	gla2DDrawInfo *di;
+	float	y, ybase;
+	IpoCurve *icu;
+
+	if (!key->ipo) return;
+
+	scr_rct.xmin= saction->area->winrct.xmin + ACTWIDTH;
+	scr_rct.ymin= saction->area->winrct.ymin + saction->v2d.mask.ymin-SCROLLB;
+	scr_rct.xmax= saction->area->winrct.xmin + saction->v2d.hor.xmax;
+	scr_rct.ymax= saction->area->winrct.ymin + saction->v2d.mask.ymax; 
+	di= glaBegin2DDraw(&scr_rct, &G.v2d->cur);
+
+	ybase = key->totkey*(CHANNELHEIGHT+CHANNELSKIP);
+
+	for (icu = key->ipo->curve.first; icu ; icu = icu->next) {
+
+		int frame1_x, channel_y;
+
+		/* lets not deal with the "speed" Ipo
+		 */
+		if (icu->adrcode==0) continue;
+
+		y = ybase	- (CHANNELHEIGHT+CHANNELSKIP)*(icu->adrcode-1);
+		gla2DDrawTranslatePt(di, 1, y, &frame1_x, &channel_y);
+
+		/* all frames that have a frame number less than one
+		 * get a desaturated orange background
+		 */
+		glEnable(GL_BLEND);
+		glColor4b(0x55, 0x22, 0x11, 0x22);
+		glRectf(0,        channel_y-CHANNELHEIGHT/2,  
+				frame1_x, channel_y+CHANNELHEIGHT/2);
+
+		/* frames one and higher get a saturated orange background
+		 */
+		glColor4b(0x55, 0x22, 0x11, 0x44);
+		glRectf(frame1_x,         channel_y-CHANNELHEIGHT/2,  
+				G.v2d->hor.xmax,  channel_y+CHANNELHEIGHT/2);
+		glDisable(GL_BLEND);
+
+		/* draw the little squares
+		 */
+		draw_icu_channel(di, icu, 0, y); 
+	}
+
+	glaEnd2DDraw(di);
+}
+
 void drawactionspace(ScrArea *sa, void *spacedata)
 {
 
 	short ofsx = 0, ofsy = 0;
-	
+	Key *key;
+	short maxymin;
+
 	if (!G.saction)
 		return;
 
-
 	if (!G.saction->pin) {
 		if (OBACT)
 			G.saction->action = OBACT->action;
 		else
 			G.saction->action=NULL;
 	}
+	key = get_action_mesh_key();
+
+	/* Damn I hate hunting to find my rvk's because
+	 * they have scrolled off of the screen ... this
+	 * oughta fix it
+	 */
+		   
+	if (key) {
+		if (G.v2d->cur.ymin < -CHANNELHEIGHT) 
+			G.v2d->cur.ymin = -CHANNELHEIGHT;
+		
+		maxymin = key->totkey*(CHANNELHEIGHT+CHANNELSKIP);
+		if (G.v2d->cur.ymin > maxymin) G.v2d->cur.ymin = maxymin;
+	}
+	
+	/* Lets make sure the width of the left hand of the screen
+	 * is set to an appropriate value based on whether sliders
+	 * are showing of not
+	 */
+	if (key && showsliders) ACTWIDTH = NAMEWIDTH + SLIDERWIDTH;
+	else ACTWIDTH = NAMEWIDTH;
 
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA) ;
 
@@ -369,15 +606,20 @@ void drawactionspace(ScrArea *sa, void *spacedata)
 		if(G.v2d->scroll) {	
 			ofsx= curarea->winrct.xmin;	
 			ofsy= curarea->winrct.ymin;
-			glViewport(ofsx+G.v2d->mask.xmin,  ofsy+G.v2d->mask.ymin, ( ofsx+G.v2d->mask.xmax-1)-(ofsx+G.v2d->mask.xmin)+1, ( ofsy+G.v2d->mask.ymax-1)-( ofsy+G.v2d->mask.ymin)+1); 
-			glScissor(ofsx+G.v2d->mask.xmin,  ofsy+G.v2d->mask.ymin, ( ofsx+G.v2d->mask.xmax-1)-(ofsx+G.v2d->mask.xmin)+1, ( ofsy+G.v2d->mask.ymax-1)-( ofsy+G.v2d->mask.ymin)+1);
+			glViewport(ofsx+G.v2d->mask.xmin,  ofsy+G.v2d->mask.ymin, 
+					   ( ofsx+G.v2d->mask.xmax-1)-(ofsx+G.v2d->mask.xmin)+1, 
+					   ( ofsy+G.v2d->mask.ymax-1)-( ofsy+G.v2d->mask.ymin)+1); 
+			glScissor(ofsx+G.v2d->mask.xmin,  ofsy+G.v2d->mask.ymin, 
+					  ( ofsx+G.v2d->mask.xmax-1)-(ofsx+G.v2d->mask.xmin)+1, 
+					  ( ofsy+G.v2d->mask.ymax-1)-( ofsy+G.v2d->mask.ymin)+1);
 		}
 	}
 
 	glClearColor(.45, .45, .45, 0.0); 
 	glClear(GL_COLOR_BUFFER_BIT);
 
-	myortho2 (G.v2d->cur.xmin, G.v2d->cur.xmax, G.v2d->cur.ymin, G.v2d->cur.ymax);
+	myortho2 (G.v2d->cur.xmin, G.v2d->cur.xmax, 
+			  G.v2d->cur.ymin, G.v2d->cur.ymax);
 
 	/*	Draw backdrop */
 	calc_ipogrid();	
@@ -386,25 +628,49 @@ void drawactionspace(ScrArea *sa, void *spacedata)
 	/* Draw channel strips */
 	draw_channel_strips(G.saction);
 
+	if (key) {
+		/* if there is a mesh with rvk's selected,
+		 * then draw the key frames in the action window
+		 */
+		draw_mesh_strips(G.saction, key);
+		/*meshactionbuts(G.saction, key);*/
+	}
+
+
 	/* Draw current frame */
-	glViewport(ofsx+G.v2d->mask.xmin,  ofsy+G.v2d->mask.ymin, ( ofsx+G.v2d->mask.xmax-1)-(ofsx+G.v2d->mask.xmin)+1, ( ofsy+G.v2d->mask.ymax-1)-( ofsy+G.v2d->mask.ymin)+1); 
-	glScissor(ofsx+G.v2d->mask.xmin,  ofsy+G.v2d->mask.ymin, ( ofsx+G.v2d->mask.xmax-1)-(ofsx+G.v2d->mask.xmin)+1, ( ofsy+G.v2d->mask.ymax-1)-( ofsy+G.v2d->mask.ymin)+1);
-	myortho2 (G.v2d->cur.xmin, G.v2d->cur.xmax, G.v2d->cur.ymin, G.v2d->cur.ymax);
+	glViewport(ofsx+G.v2d->mask.xmin,  
+             ofsy+G.v2d->mask.ymin, 
+             ( ofsx+G.v2d->mask.xmax-1)-(ofsx+G.v2d->mask.xmin)+1, 
+             ( ofsy+G.v2d->mask.ymax-1)-( ofsy+G.v2d->mask.ymin)+1); 
+	glScissor(ofsx+G.v2d->mask.xmin,  
+            ofsy+G.v2d->mask.ymin, 
+            ( ofsx+G.v2d->mask.xmax-1)-(ofsx+G.v2d->mask.xmin)+1, 
+            ( ofsy+G.v2d->mask.ymax-1)-( ofsy+G.v2d->mask.ymin)+1);
+	myortho2(G.v2d->cur.xmin, G.v2d->cur.xmax, 
+           G.v2d->cur.ymin, G.v2d->cur.ymax);
 	draw_cfra_action();
 
 	/* Draw scroll */
 	mywinset(curarea->win);
 	if(curarea->winx>SCROLLB+10 && curarea->winy>SCROLLH+10) {
-		myortho2(-0.5, curarea->winx+0.5, -0.5, curarea->winy+0.5);
-		if(G.v2d->scroll) drawscroll(0);
+      myortho2(-0.5, curarea->winx+0.5, -0.5, curarea->winy+0.5);
+      if(G.v2d->scroll) drawscroll(0);
 	}
 
 	/* Draw channel names */
 	draw_channel_names();
 
+	if ( key ) {
+		/* if there is a mesh with rvk's selected,
+		 * then draw the key frames in the action window
+		 */
+		meshactionbuts(G.saction, key);
+	}
+
 	curarea->win_swap= WIN_BACK_OK;
 }
 
+
 void draw_channel_name(const char* name, short type, float ypos, int selected)
 {
 }
@@ -449,6 +715,20 @@ void draw_ipo_channel(gla2DDrawInfo *di, Ipo *ipo, int flags, float ypos)
 	}
 }
 
+void draw_icu_channel(gla2DDrawInfo *di, IpoCurve *icu, int flags, float ypos)
+{
+	/* draw the keys for an IpoCurve
+	 */
+	BezTriple **blist;
+	int totvert;
+
+	blist = icu_to_keylist(icu, flags, &totvert);
+	if (blist){
+		draw_keylist(di,totvert, blist, ypos);
+		MEM_freeN(blist);
+	}
+}
+
 void draw_action_channel(gla2DDrawInfo *di, bAction *act, int flags, float ypos)
 {
 	BezTriple **blist;
@@ -503,6 +783,31 @@ static BezTriple **ob_to_keylist(Object *ob, int flags, int *totvert)
 	return list;
 }
 
+static BezTriple **icu_to_keylist(IpoCurve *icu, int flags, int *totvert)
+{
+	/* compile a list of all bezier triples in an
+	 * IpoCurve.
+	 */
+	int v, count = 0;
+
+	BezTriple **list = NULL;
+
+	count=icu->totvert;
+
+	if (count){
+		list = MEM_callocN(sizeof(BezTriple*)*count, "beztlist");
+		count=0;
+			
+		for (v=0; v<icu->totvert; v++){
+			list[count++]=&icu->bezt[v];
+		}
+		qsort(list, count, sizeof(BezTriple*), bezt_compare);
+	}
+	(*totvert)=count;
+	return list;
+
+}
+
 static BezTriple **ipo_to_keylist(Ipo *ipo, int flags, int *totvert)
 {
 	IpoCurve *icu;