Index: source/blender/src/drawnode.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawnode.c,v
retrieving revision 1.52
diff -u -p -r1.52 drawnode.c
--- source/blender/src/drawnode.c	21 Dec 2006 18:11:06 -0000	1.52
+++ source/blender/src/drawnode.c	21 Dec 2006 22:36:05 -0000
@@ -1003,7 +1003,7 @@ static int node_composit_buts_defocus(ui
 		NodeDefocus *nqd = node->storage;
 		short dy = butr->ymin + 209;
 		short dx = butr->xmax - butr->xmin; 
-		char* mstr1 = "Bokeh Type%t|Octagon %x8|Heptagon %x7|Hexagon %x6|Pentagon %x5|Square %x4|Triangle %x3|Disk %x0";
+		char* mstr1 = "Bokeh Type%t|Enneagon %x9|Octagon %x8|Heptagon %x7|Hexagon %x6|Pentagon %x5|Square %x4|Triangle %x3|Disk %x0";
 
 		uiDefBut(block, LABEL, B_NOP, "Bokeh Type", butr->xmin, dy, dx, 19, NULL, 0, 0, 0, 0, "");
 		uiDefButC(block, MENU, B_NODE_EXEC+node->nr, mstr1,
Index: source/blender/blenkernel/intern/node_composite.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/blenkernel/intern/node_composite.c,v
retrieving revision 1.85
diff -u -p -r1.85 node_composite.c
--- source/blender/blenkernel/intern/node_composite.c	21 Dec 2006 18:23:30 -0000	1.85
+++ source/blender/blenkernel/intern/node_composite.c	21 Dec 2006 22:36:06 -0000
@@ -3159,14 +3159,14 @@ typedef struct BokehCoeffs {
 // returns length of array in 'len_bkh',
 // radius squared of inscribed disk in 'inradsq', needed in getWeight() test,
 // BKH[8] is the data returned for the bokeh shape & bkh_b[4] is it's 2d bound
-static void makeBokeh(char bktype, char ro, int* len_bkh, float* inradsq, BokehCoeffs BKH[8], float bkh_b[4])
+static void makeBokeh(char bktype, char ro, int* len_bkh, float* inradsq, BokehCoeffs BKH[9], float bkh_b[4])
 {
 	float x0, x1, y0, y1, dx, dy, iDxy, w = ro*M_PI/180.f;
 	float wi = (360.f/bktype)*M_PI/180.f;
 	int i, ov, nv;
 	
 	// bktype must be at least 3 & <= 8
-	bktype = (bktype<3) ? 3 : ((bktype>8) ? 8 : bktype);
+	bktype = (bktype<3) ? 3 : ((bktype>9) ? 9 : bktype);
 	*len_bkh = bktype;
 	*inradsq = -1.f;
 
@@ -3345,7 +3345,7 @@ static void defocus_blur(CompBuf* new, C
 {
 	CompBuf *wts;	// weights buffer
 	CompBuf *crad;	// CoC radius buffer
-	BokehCoeffs BKH[8];	// bokeh shape data, here never > 8 pts.
+	BokehCoeffs BKH[9];	// bokeh shape data, here never > 9 pts.
 	float bkh_b[4] = {0};	// shape 2D bound
 	unsigned int p, px, p4, zp, cp, cp4;
 	float *ctcol, u, v, iZ, ct_crad, bcrad, lwt, wt=0, cR2=0;