Index: source/blender/makesdna/DNA_userdef_types.h
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/makesdna/DNA_userdef_types.h,v
retrieving revision 1.56
diff -u -r1.56 DNA_userdef_types.h
--- source/blender/makesdna/DNA_userdef_types.h	8 Jun 2006 19:05:58 -0000	1.56
+++ source/blender/makesdna/DNA_userdef_types.h	27 Sep 2006 06:57:36 -0000
@@ -173,6 +173,8 @@
 	short rvisize;		/* rotating view icon size */
 	short rvibright;	/* rotating view icon brightness */
 	short pad1;
+	int pad2;
+	int maxnumthreads;
 } UserDef;
 
 extern UserDef U; /* from usiblender.c !!!! */
Index: source/blender/render/intern/source/pipeline.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/render/intern/source/pipeline.c,v
retrieving revision 1.94
diff -u -r1.94 pipeline.c
--- source/blender/render/intern/source/pipeline.c	6 Sep 2006 19:13:23 -0000	1.94
+++ source/blender/render/intern/source/pipeline.c	27 Sep 2006 06:59:51 -0000
@@ -1120,7 +1120,7 @@
 		IMB_exrtile_begin_write(rr->exrhandle, str, rr->rectx, rr->recty, rr->rectx/re->xparts, rr->recty/re->yparts);
 	}
 	
-	if(re->r.mode & R_THREADS) maxthreads= 2;
+	if(re->r.mode & R_THREADS) maxthreads= U.maxnumthreads;
 	else maxthreads= 1;
 	
 	BLI_init_threads(&threads, do_part_thread, maxthreads);
Index: source/blender/src/space.c
===================================================================
RCS file: /cvsroot/bf-blender/blender/source/blender/src/space.c,v
retrieving revision 1.378
diff -u -r1.378 space.c
--- source/blender/src/space.c	25 Sep 2006 22:00:52 -0000	1.378
+++ source/blender/src/space.c	27 Sep 2006 07:51:38 -0000
@@ -2464,8 +2464,8 @@
 	uiBlock *block;
 	static short cur_light=0, cur_light_var=0;
 	float fac, col[3];
-	short xpos, ypos, ypostab,  buth, rspace, dx, y1, y2, y3, y4, y5, y6;
-	short y2label, y3label, y4label, y5label, y6label;
+	short xpos, ypos, ypostab,  buth, rspace, dx, y1, y2, y3, y4, y5, y6, y7;
+	short y2label, y3label, y4label, y5label, y6label, y7label;
 	short spref, mpref, lpref, smfileselbut;
 	short edgsp, midsp;
 	char naam[32];
@@ -2513,6 +2513,7 @@
 	y4 = ypos+3*(buth+rspace);
 	y5 = ypos+4*(buth+rspace);
 	y6 = ypos+5*(buth+rspace);
+	y7 = ypos+6*(buth+rspace);
 
 
 	y2label = y2-2;		/* adjustments to offset the labels down to align better */
@@ -2520,7 +2521,7 @@
 	y4label = y4-2;
 	y5label = y5-2;
 	y6label = y6-2;
-
+    y7label = y7-2;
 
 	/* set the colour to blue and draw the main 'tab' controls */
 
@@ -3087,8 +3088,12 @@
 
 
 		uiDefBut(block, LABEL,0,"System:",
-			(xpos+edgsp+(4*midsp)+(4*mpref)),y6label,mpref,buth,
+			(xpos+edgsp+(4*midsp)+(4*mpref)),y7label,mpref,buth,
 			0, 0, 0, 0, 0, "");
+		uiDefButI(block, NUM, 0, "Max Num Threads ",
+			  (xpos+edgsp+(4*mpref)+(4*midsp)), y6, mpref, buth, 
+			  &U.maxnumthreads, 2, 16, 30, 2, 
+              "Max Number Of CPU Threads During render"); 
 		uiDefButI(block, NUM, B_MEMCACHELIMIT, "MEM Cache Limit ",
 			  (xpos+edgsp+(4*mpref)+(4*midsp)), y5, mpref, buth, 
 			  &U.memcachelimit, 0.0, 1024.0, 30, 2,