- Added more space in icons image (blenderbuttons.png)

It now only uses 1 extra row of 21 buttons. More can simply be added
- Added new icons for the new proportional edit options Root, Linear and
  Constant
- Made sure pulldown and pop-up menu work for new prop options

- Transform fix; proportional edit circle was drawing in Object mode

source/blender/include/BIF_resources.h

@@ -159,8 +159,8 @@ typedef enum {
 	ICON_BPIBFOLDER_ERR,
 	ICON_UGLY_GREEN_RING,
 	ICON_GHOST,
-	ICON_SHARPCURVE,
+	ICON_BLANK32,
-	ICON_SMOOTHCURVE,
+	ICON_BLANK33,
 	ICON_VERTEXSEL,
 	ICON_EDGESEL,
 	ICON_FACESEL,
@@ -257,7 +257,30 @@ typedef enum {
 	ICON_CONSTRAINT,
 	ICON_CAMERA_DEHLT,
 	ICON_ARMATURE_DEHLT,
-#define BIFICONID_LAST		(ICON_ARMATURE_DEHLT)
+	
+	ICON_SHARPCURVE,
+	ICON_SMOOTHCURVE,
+	ICON_ROOTCURVE,
+	ICON_LINCURVE,
+	ICON_NOCURVE,
+	ICON_BLANK46,
+	ICON_BLANK47,
+	ICON_BLANK48,
+	ICON_BLANK49,
+	ICON_BLANK50,
+	ICON_BLANK51,
+	ICON_BLANK52,
+	ICON_BLANK53,
+	ICON_BLANK54,
+	ICON_BLANK55,
+	ICON_BLANK56,
+	ICON_BLANK57,
+	ICON_BLANK58,
+	ICON_BLANK59,
+	ICON_BLANK60,
+	ICON_BLANK61,
+
+#define BIFICONID_LAST		(ICON_BLANK61)
 #define BIFNICONIDS			(BIFICONID_LAST-BIFICONID_FIRST + 1)
 } BIFIconID;
 

source/blender/src/drawview.c

@@ -1917,7 +1917,7 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
 		constline_callback();
 #ifdef NEWTRANSFORM
 		BIF_drawConstraint();
-		BIF_drawPropCircle();
+		if(G.obedit) BIF_drawPropCircle();	// only editmode has proportional edit
 #endif
 	}
 

source/blender/src/header_view3d.c

@@ -1788,14 +1788,8 @@ static void do_view3d_edit_propfalloffmenu(void *arg, int event)
 {
 	extern int prop_mode;
 	
-	switch(event) {
+	prop_mode= event;
-	case 0: /* proportional edit - sharp*/
+	
-		prop_mode = 0;
-		break;
-	case 1: /* proportional edit - smooth*/
-		prop_mode = 1;
-		break;
-		}
 	allqueue(REDRAWVIEW3D, 1);
 }
 
@@ -1812,6 +1806,12 @@ static uiBlock *view3d_edit_propfalloffmenu(void *arg_unused)
 	else uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Sharp|Shift O", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 0, "");
 	if (prop_mode==1) uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Smooth|Shift O", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
 	else uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Smooth|Shift O",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
+	if (prop_mode==2) uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Root|Shift O", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 2, 1, "");
+	else uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Root|Shift O",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 2, 1, "");
+	if (prop_mode==3) uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Linear|Shift O", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 3, 1, "");
+	else uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Linear|Shift O",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 3, 1, "");
+	if (prop_mode==4) uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Constant|Shift O", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 4, 1, "");
+	else uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Constant|Shift O",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 4, 1, "");
 		
 	uiBlockSetDirection(block, UI_RIGHT);
 	uiTextBoundsBlock(block, 60);
@@ -3429,6 +3429,9 @@ static char *propfalloff_pup(void)
 	strcpy(string, "Falloff:%t"); 
 	strcat(string, "|Sharp Falloff%x0"); 
 	strcat(string, "|Smooth Falloff%x1");
+	strcat(string, "|Root Falloff%x2"); 
+	strcat(string, "|Linear Falloff%x3");
+	strcat(string, "|Constant, No Falloff%x4");
 	return (string);
 }
 

source/blender/src/resources.c

@@ -255,7 +255,8 @@ void BIF_resources_init(void)
 
 	common_icons_arr= MEM_mallocN(sizeof(*common_icons_arr)*BIFNICONIDS, "common_icons");
 
-	for (y=0; y<10; y++) {
+	/* hack! */
+	for (y=0; y<11; y++) {
 		for (x=0; x<21; x++) {
 			int rowstride= bbuf->x*4;
 			unsigned char *start= ((char*) bbuf->rect) + (y*21 + 3)*rowstride + (x*20 + 3)*4;
@@ -278,7 +279,7 @@ void BIF_resources_init(void)
 	// texid= init_icon_texture(bbuf);
 
 		/* hack! */
-	for (y=0; y<10; y++) {
+	for (y=0; y<11; y++) {
 		for (x=0; x<21; x++) {
 			if (x==11 && y==6) {
 				def_icon(bbuf, texid, ICON_BEVELBUT_HLT,			x, y, 7, 13, 4, 2);