Changed some references to 'size' to now refer to 'scale'. If anybody

sees a reference to size, as it pertains to a 3D object, please let
me know.

10 files changed, 34 insertions, 34 deletions

diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index 73da82ae31f..0f257224ff1 100644
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -341,7 +341,7 @@ void get_constraint_typestring (char *str, void *con_v)
 		strcpy (str, "Copy Location");
 		return;
 	case CONSTRAINT_TYPE_SIZELIKE:
-		strcpy (str, "Copy Size");
+		strcpy (str, "Copy Scale");
 		return;
 	case CONSTRAINT_TYPE_ACTION:
 		strcpy (str, "Action");
@@ -1030,7 +1030,7 @@ static uiBlock *add_constraintmenu(void *arg_unused)
 
 	uiDefBut(block, BUTM, B_CONSTRAINT_ADD_LOCLIKE,"Copy Location",		0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
 	uiDefBut(block, BUTM, B_CONSTRAINT_ADD_ROTLIKE,"Copy Rotation",		0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
-	uiDefBut(block, BUTM, B_CONSTRAINT_ADD_SIZELIKE,"Copy Size",		0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
+	uiDefBut(block, BUTM, B_CONSTRAINT_ADD_SIZELIKE,"Copy Scale",		0, yco-=20, 160, 19, NULL, 0.0, 0.0, 1, 0, "");
 	
 	uiDefBut(block, SEPR, 0, "",					0, yco-=6, 120, 6, NULL, 0.0, 0.0, 0, 0, "");
 	
diff --git a/source/blender/src/drawipo.c b/source/blender/src/drawipo.c
index 233f040bd7b..54fcda9181c 100644
--- a/source/blender/src/drawipo.c
+++ b/source/blender/src/drawipo.c
@@ -1926,9 +1926,9 @@ static char *ipodriver_channelselect_pup(void)
 	tmp+= sprintf(tmp, "|Rot X %%x%d", OB_ROT_X);
 	tmp+= sprintf(tmp, "|Rot Y %%x%d", OB_ROT_Y);
 	tmp+= sprintf(tmp, "|Rot Z %%x%d", OB_ROT_Z);
-	tmp+= sprintf(tmp, "|Size X %%x%d", OB_SIZE_X);
-	tmp+= sprintf(tmp, "|Size Y %%x%d", OB_SIZE_Y);
-	tmp+= sprintf(tmp, "|Size Z %%x%d", OB_SIZE_Z);
+	tmp+= sprintf(tmp, "|Scale X %%x%d", OB_SIZE_X);
+	tmp+= sprintf(tmp, "|Scale Y %%x%d", OB_SIZE_Y);
+	tmp+= sprintf(tmp, "|Scale Z %%x%d", OB_SIZE_Z);
 	
 	return (string);
 }
diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c
index d50fa3bbed5..31390cca75b 100644
--- a/source/blender/src/drawview.c
+++ b/source/blender/src/drawview.c
@@ -1864,11 +1864,11 @@ static void v3d_posearmature_buts(uiBlock *block, Object *ob, float lim)
 	
 	uiBlockBeginAlign(block);
 	uiDefIconButBitS(block, ICONTOG, OB_LOCK_SCALEX, REDRAWVIEW3D, ICON_UNLOCKED,	160,70,20,19, &(pchan->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
-	uiDefButF(block, NUM, B_ARMATUREPANEL2, "SizeX:",	180, 70, 120, 19, pchan->size, -lim, lim, 10, 3, "");
+	uiDefButF(block, NUM, B_ARMATUREPANEL2, "ScaleX:",	180, 70, 120, 19, pchan->size, -lim, lim, 10, 3, "");
 	uiDefIconButBitS(block, ICONTOG, OB_LOCK_SCALEY, REDRAWVIEW3D, ICON_UNLOCKED,	160,50,20,19, &(pchan->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
-	uiDefButF(block, NUM, B_ARMATUREPANEL2, "SizeY:",	180, 50, 120, 19, pchan->size+1, -lim, lim, 10, 3, "");
+	uiDefButF(block, NUM, B_ARMATUREPANEL2, "ScaleY:",	180, 50, 120, 19, pchan->size+1, -lim, lim, 10, 3, "");
 	uiDefIconButBitS(block, ICONTOG, OB_LOCK_SCALEZ, REDRAWVIEW3D, ICON_UNLOCKED,	160,30,20,19, &(pchan->protectflag), 0, 0, 0, 0, "Protects this value from being Transformed");
-	uiDefButF(block, NUM, B_ARMATUREPANEL2, "SizeZ:",	180, 30, 120, 19, pchan->size+2, -lim, lim, 10, 3, "");
+	uiDefButF(block, NUM, B_ARMATUREPANEL2, "ScaleZ:",	180, 30, 120, 19, pchan->size+2, -lim, lim, 10, 3, "");
 	uiBlockEndAlign(block);
 }
 
@@ -2279,7 +2279,7 @@ static void view3d_panel_object(short cntrl)	// VIEW3D_HANDLER_OBJECT
 		uiDefButF(block, NUM, B_OBJECTPANELSCALE, "ScaleZ:",		30, 40, 120, 19, &(ob_scale[2]), -lim, lim, 10, 3, "");
 		uiBlockEndAlign(block);
 		
-		uiDefButS(block, TOG, REDRAWVIEW3D, "Link Scale",		10, 10, 140, 19, &(link_scale), 0, 1, 0, 0, "Size values vary proportionally in all directions");
+		uiDefButS(block, TOG, REDRAWVIEW3D, "Link Scale",		10, 10, 140, 19, &(link_scale), 0, 1, 0, 0, "Scale values vary proportionally in all directions");
 
 		bb= object_get_boundbox(ob);
 		if (bb) {
diff --git a/source/blender/src/editaction.c b/source/blender/src/editaction.c
index 25499da2d34..48109878dac 100644
--- a/source/blender/src/editaction.c
+++ b/source/blender/src/editaction.c
@@ -1026,7 +1026,7 @@ void transform_actionchannel_keys(int mode, int dummy)
 				}
 	
 				if (mode=='s'){
-					sprintf(str, "sizeX: %.3f", fac);
+					sprintf(str, "scaleX: %.3f", fac);
 					headerprint(str);
 				}
 				else if (mode=='g'){
@@ -1228,7 +1228,7 @@ void transform_meshchannel_keys(char mode, Key *key)
 			 * the grab/scale we are performing
 			 */
             if (mode=='s'){
-                sprintf(str, "sizeX: %.3f", fac);
+                sprintf(str, "scaleX: %.3f", fac);
                 headerprint(str);
             }
             else if (mode=='g'){
diff --git a/source/blender/src/editconstraint.c b/source/blender/src/editconstraint.c
index be35acfde69..b1ff54ae46f 100644
--- a/source/blender/src/editconstraint.c
+++ b/source/blender/src/editconstraint.c
@@ -653,21 +653,21 @@ void add_constraint(int only_IK)
 	else {
 		if(pchanact) {
 			if(pchansel)
-				nr= pupmenu("Add Constraint to Active Bone%t|Copy Location%x1|Copy Rotation%x2|Copy Size%x8|Track To%x3|Floor%x4|Locked Track%x5|Stretch To%x7");
+				nr= pupmenu("Add Constraint to Active Bone%t|Copy Location%x1|Copy Rotation%x2|Copy Scale%x8|Track To%x3|Floor%x4|Locked Track%x5|Stretch To%x7");
 			else if(obsel && obsel->type==OB_CURVE)
-				nr= pupmenu("Add Constraint to Active Object%t|Copy Location%x1|Copy Rotation%x2|Copy Size%x8|Track To%x3|Floor%x4|Locked Track%x5|Follow Path%x6|Stretch To%x7");
+				nr= pupmenu("Add Constraint to Active Object%t|Copy Location%x1|Copy Rotation%x2|Copy Scale%x8|Track To%x3|Floor%x4|Locked Track%x5|Follow Path%x6|Stretch To%x7");
 			else if(obsel)
-				nr= pupmenu("Add Constraint to Active Object%t|Copy Location%x1|Copy Rotation%x2|Copy Size%x8|Track To%x3|Floor%x4|Locked Track%x5|Stretch To%x7");
+				nr= pupmenu("Add Constraint to Active Object%t|Copy Location%x1|Copy Rotation%x2|Copy Scale%x8|Track To%x3|Floor%x4|Locked Track%x5|Stretch To%x7");
 			else
-				nr= pupmenu("Add Constraint to New Empty Object%t|Copy Location%x1|Copy Rotation%x2|Copy Size%x8|Track To%x3|Floor%x4|Locked Track%x5|Stretch To%x7");
+				nr= pupmenu("Add Constraint to New Empty Object%t|Copy Location%x1|Copy Rotation%x2|Copy Scale%x8|Track To%x3|Floor%x4|Locked Track%x5|Stretch To%x7");
 		}
 		else {
 			if(obsel && obsel->type==OB_CURVE)
-				nr= pupmenu("Add Constraint to Active Object%t|Copy Location%x1|Copy Rotation%x2|Copy Size%x8|Track To%x3|Floor%x4|Locked Track%x5|Follow Path%x6");
+				nr= pupmenu("Add Constraint to Active Object%t|Copy Location%x1|Copy Rotation%x2|Copy Scale%x8|Track To%x3|Floor%x4|Locked Track%x5|Follow Path%x6");
 			else if(obsel)
-				nr= pupmenu("Add Constraint to Active Object%t|Copy Location%x1|Copy Rotation%x2|Copy Size%x8|Track To%x3|Floor%x4|Locked Track%x5");
+				nr= pupmenu("Add Constraint to Active Object%t|Copy Location%x1|Copy Rotation%x2|Copy Scale%x8|Track To%x3|Floor%x4|Locked Track%x5");
 			else
-				nr= pupmenu("Add Constraint to New Empty Object%t|Copy Location%x1|Copy Rotation%x2|Copy Size%x8|Track To%x3|Floor%x4|Locked Track%x5");
+				nr= pupmenu("Add Constraint to New Empty Object%t|Copy Location%x1|Copy Rotation%x2|Copy Scale%x8|Track To%x3|Floor%x4|Locked Track%x5");
 		}
 	}
 	
diff --git a/source/blender/src/editipo.c b/source/blender/src/editipo.c
index b3b43c0a348..db31bcb172f 100644
--- a/source/blender/src/editipo.c
+++ b/source/blender/src/editipo.c
@@ -2507,7 +2507,7 @@ void common_insertkey(void)
 		ob= OBACT;
 
 		if (ob && (ob->flag & OB_POSEMODE)) {
-			strcpy(menustr, "Insert Key%t|Loc%x0|Rot%x1|Size%x2|LocRot%x3|LocRotSize%x4|Avail%x9|VisualLoc%x11|VisualRot%x12|VisualLocRot%x13");
+			strcpy(menustr, "Insert Key%t|Loc%x0|Rot%x1|Scale%x2|LocRot%x3|LocRotScale%x4|Avail%x9|VisualLoc%x11|VisualRot%x12|VisualLocRot%x13");
 		}
 		else {
 			base= FIRSTBASE;
@@ -2516,7 +2516,7 @@ void common_insertkey(void)
 				base= base->next;
 			}
 			if(base==NULL) return;
-			strcpy(menustr, "Insert Key%t|Loc%x0|Rot%x1|Size%x2|LocRot%x3|LocRotSize%x4|Layer%x5|Avail%x9|VisualLoc%x11|VisualRot%x12|VisualLocRot%x13");
+			strcpy(menustr, "Insert Key%t|Loc%x0|Rot%x1|Scale%x2|LocRot%x3|LocRotScale%x4|Layer%x5|Avail%x9|VisualLoc%x11|VisualRot%x12|VisualLocRot%x13");
 		}
 
 		if(ob) {
@@ -2668,9 +2668,9 @@ void common_insertkey(void)
 
 		if(event==0) BIF_undo_push("Insert Loc Key");
 		else if(event==1) BIF_undo_push("Insert Rot Key");
-		else if(event==2) BIF_undo_push("Insert Size Key");
+		else if(event==2) BIF_undo_push("Insert Scale Key");
 		else if(event==3) BIF_undo_push("Insert LocRot Key");
-		else if(event==4) BIF_undo_push("Insert LocRotSize Key");
+		else if(event==4) BIF_undo_push("Insert LocRotSca;e Key");
 		else if(event==5) BIF_undo_push("Insert Layer Key");
 		else if(event==7) BIF_undo_push("Insert Vertex Key");
 		else if(event==9) BIF_undo_push("Insert Avail Key");
@@ -4078,7 +4078,7 @@ void transform_ipo(int mode)
 					if(tv->flag==0) tv->loc[1]= size[1]*(tv->oldloc[1]-cent[1])+ cent[1];
 				}
 				
-				sprintf(str, "sizeX: %.3f   sizeY: %.3f  ", size[0], size[1]);
+				sprintf(str, "scaleX: %.3f   scaleY: %.3f  ", size[0], size[1]);
 				headerprint(str);
 				
 			}
diff --git a/source/blender/src/editipo_lib.c b/source/blender/src/editipo_lib.c
index ed9466a3bf9..4c6bb24a3da 100644
--- a/source/blender/src/editipo_lib.c
+++ b/source/blender/src/editipo_lib.c
@@ -50,7 +50,7 @@
 
 char *ob_ic_names[OB_TOTNAM] = { "LocX", "LocY", "LocZ", "dLocX", "dLocY", "dLocZ",
 	"RotX", "RotY", "RotZ", "dRotX", "dRotY", "dRotZ",
-	"SizeX", "SizeY", "SizeZ", "dSizeX", "dSizeY", "dSizeZ",
+	"ScaleX", "ScaleY", "ScaleZ", "dScaleX", "dScaleY", "dScaleZ",
 	"Layer", "Time", "ColR", "ColG", "ColB", "ColA",
 	"FStreng", "FFall", "RDamp", "Damping", "Perm" };
 
@@ -90,8 +90,8 @@ char *la_ic_names[LA_TOTNAM] = { "Energ", "R", "G", "B", "Dist", "SpoSi", "SpoBl
 /* yafray: two curve names added, 'Apert' for aperture, and 'FDist' for focal distance */
 char *cam_ic_names[CAM_TOTNAM] = { "Lens", "ClSta", "ClEnd", "Apert", "FDist" };
 char *snd_ic_names[SND_TOTNAM] = { "Vol", "Pitch", "Pan", "Atten" };
-char *ac_ic_names[AC_TOTNAM] = {"LocX", "LocY", "LocZ", "SizeX", "SizeY",
-	"SizeZ", "QuatW", "QuatX", "QuatY", "QuatZ"};
+char *ac_ic_names[AC_TOTNAM] = {"LocX", "LocY", "LocZ", "ScaleX", "ScaleY",
+	"ScaleZ", "QuatW", "QuatX", "QuatY", "QuatZ"};
 char *ic_name_empty[1] ={ "" };
 char *fluidsim_ic_names[FLUIDSIM_TOTNAM] = { "Fac-Visc", "Fac-Time",  "GravX","GravY","GravZ",  "VelX","VelY","VelZ", "Active"  };
 
diff --git a/source/blender/src/editnla.c b/source/blender/src/editnla.c
index 76c48657815..e01ddae3b97 100644
--- a/source/blender/src/editnla.c
+++ b/source/blender/src/editnla.c
@@ -899,7 +899,7 @@ void transform_nlachannel_keys(int mode, int dummy)
 				}
 			
 				if (mode=='s'){
-					sprintf(str, "sizeX: %.3f", fac);
+					sprintf(str, "scaleX: %.3f", fac);
 					headerprint(str);
 				}
 				else if (mode=='g'){
@@ -1675,7 +1675,7 @@ void winqreadnlaspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				
 			case SKEY:
 				if(G.qual==LR_ALTKEY) {
-					val= pupmenu("Action Strip Scale%t|Clear Strip Size%x1|Remap Start/End%x2");
+					val= pupmenu("Action Strip Scale%t|Clear Strip Scale%x1|Remap Start/End%x2");
 					if(val==1)
 						reset_action_strips(1);
 					else if(val==2)
diff --git a/source/blender/src/poseobject.c b/source/blender/src/poseobject.c
index 865db9fe000..d6bf46459cd 100644
--- a/source/blender/src/poseobject.c
+++ b/source/blender/src/poseobject.c
@@ -440,7 +440,7 @@ void pose_copy_menu(void)
 	if(pchan==NULL) return;
 	pchanact= pchan;
 	
-	nr= pupmenu("Copy Pose Attributes %t|Location%x1|Rotation%x2|Size%x3|Constraints");
+	nr= pupmenu("Copy Pose Attributes %t|Location%x1|Rotation%x2|Scale%x3|Constraints");
 	
 	for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) {
 		if(arm->layer & pchan->bone->layer) {
diff --git a/source/blender/src/transform.c b/source/blender/src/transform.c
index ad76cd332fd..a0c6485bd60 100755
--- a/source/blender/src/transform.c
+++ b/source/blender/src/transform.c
@@ -1349,20 +1349,20 @@ static void headerResize(TransInfo *t, float vec[3], char *str) {
 	if (t->con.mode & CON_APPLY) {
 		switch(t->num.idx_max) {
 		case 0:
-			sprintf(str, "Size: %s%s %s", &tvec[0], t->con.text, t->proptext);
+			sprintf(str, "Scale: %s%s %s", &tvec[0], t->con.text, t->proptext);
 			break;
 		case 1:
-			sprintf(str, "Size: %s : %s%s %s", &tvec[0], &tvec[20], t->con.text, t->proptext);
+			sprintf(str, "Scale: %s : %s%s %s", &tvec[0], &tvec[20], t->con.text, t->proptext);
 			break;
 		case 2:
-			sprintf(str, "Size: %s : %s : %s%s %s", &tvec[0], &tvec[20], &tvec[40], t->con.text, t->proptext);
+			sprintf(str, "Scale: %s : %s : %s%s %s", &tvec[0], &tvec[20], &tvec[40], t->con.text, t->proptext);
 		}
 	}
 	else {
 		if (t->flag & T_2D_EDIT)
-			sprintf(str, "Size X: %s   Y: %s%s %s", &tvec[0], &tvec[20], t->con.text, t->proptext);
+			sprintf(str, "Scale X: %s   Y: %s%s %s", &tvec[0], &tvec[20], t->con.text, t->proptext);
 		else
-			sprintf(str, "Size X: %s   Y: %s  Z: %s%s %s", &tvec[0], &tvec[20], &tvec[40], t->con.text, t->proptext);
+			sprintf(str, "Scale X: %s   Y: %s  Z: %s%s %s", &tvec[0], &tvec[20], &tvec[40], t->con.text, t->proptext);
 	}
 }