==Bugfix==

Made the frame boost from short to int (30000 -> 300000 frames) complete
by walking through the source and finally changing all frame-variables
to ints.

This should finally fix the framecounter warp around seen in some buttons.

If you step on any further problems that may arise starting from frame
32768 please just give me a hint and I'll fix it.

(Sorry about that, didn't know enough about Blender, when I did it the first
time...)

14 files changed, 64 insertions, 62 deletions

diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 9191e0b6c48..e688b778894 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -49,9 +49,10 @@ typedef struct bPoseChannel {
 	short				flag;		/* dynamic, for detecting transform changes */
 	short				constflag;  /* for quick detecting which constraints affect this channel */
 	short				ikflag;		/* settings for IK bones */
-	short				pathlen;	/* for drawing paths, the amount of frames */
+	short                           pad1;
+	int				pathlen;	/* for drawing paths, the amount of frames */
 	short				protectflag;/* protect channels from being transformed */
-	short				pad, pad1, pad2;
+	short				pad2;
 	
 	struct Bone			*bone;		/* set on read file or rebuild pose */
 	struct bPoseChannel *parent;	/* set on read file or rebuild pose */
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h
index 7bb367cc244..410ca665731 100644
--- a/source/blender/makesdna/DNA_actuator_types.h
+++ b/source/blender/makesdna/DNA_actuator_types.h
@@ -50,28 +50,26 @@ typedef struct bAddObjectActuator {
 typedef struct bActionActuator {								
 	struct bAction *act;	/* Pointer to action */				
 	short	type, flag;		/* Playback type */					
-	short	sta, end;		/* Start & End frames */			
+	int	sta, end;		/* Start & End frames */			
 	char	name[32];		/* For property-driven playback */	
-	short	blendin;		/* Number of frames of blending */	
+	int	blendin;		/* Number of frames of blending */	
 	short	priority;		/* Execution priority */			
-	float	stridelength;	/* Displacement incurred by cycle */
 	short	strideaxis;		/* Displacement axis */
-	short	reserved1;		/* Padding */					
-	short	reserved2;		/* Padding */						
-	short	reserved3;		/* Padding */						
+	float	stridelength;	/* Displacement incurred by cycle */
 } bActionActuator;												
 
 typedef struct bSoundActuator {
 	short flag, sndnr;
-	short sta, end;
+	int sta, end;
+	short pad1[2];
 	struct bSound *sound;
 	short type, makecopy;
-	short copymade, pad[1];
+	short copymade, pad2[1];
 } bSoundActuator;
 
 typedef struct bCDActuator {
 	short flag, sndnr;
-	short sta, end;
+	int sta, end;
 	short type, track;
 	float volume;
 } bCDActuator;
@@ -112,7 +110,7 @@ typedef struct bObjectActuator {
 
 typedef struct bIpoActuator {
 	short flag, type;
-	short sta, end;
+	int sta, end;
 	char name[32];
 	
 	short pad1, cur, butsta, butend;
@@ -136,10 +134,10 @@ typedef struct bConstraintActuator {
 
 typedef struct bGroupActuator {
 	short flag, type;
-	short sta, end;
+	int sta, end;
 	char name[32];		/* property or groupkey */
 	
-	short pad1, cur, butsta, butend;
+	short pad[3], cur, butsta, butend;/* not referenced, can remove? */
 	struct Group *group;		/* only during game */
 	
 } bGroupActuator;
@@ -185,7 +183,7 @@ typedef struct bMessageActuator {
 
 typedef struct bGameActuator {
 	short flag, type;
-	short sta, end;
+	int sta, end;
 	char filename[64];
 	char loadaniname[64];
 } bGameActuator;
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index b7dcadd501c..21380bdcdab 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -116,10 +116,11 @@ typedef struct bActionConstraint{
 	Object		*tar;
 	short		type;
 	short		local;
-	short		start;
-	short		end;
+	int		start;
+	int		end;
 	float		min;
 	float		max;
+	int             pad;
 	struct bAction	*act;
 	char		subtarget[32];
 } bActionConstraint;
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h
index a6dca412d9c..52373a8d1ce 100644
--- a/source/blender/makesdna/DNA_image_types.h
+++ b/source/blender/makesdna/DNA_image_types.h
@@ -50,7 +50,7 @@ typedef struct Image {
 	struct ImBuf *mipmap[10];
 	
 	short ok, flag;
-	short lastframe, pad;
+	int lastframe;
 
 	/* texture page */
 	short tpageflag, totbind;
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 6192c32da1f..6e3a7a2eeb7 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -181,8 +181,9 @@ typedef struct bNodeTree {
 /* data structs, for node->storage */
 
 typedef struct NodeImageAnim {
-	short frames, sfra, nr;
+	int frames, sfra, nr;
 	char cyclic, movie;
+	short pad;
 } NodeImageAnim;
 
 typedef struct NodeBlurData {
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index c34b14f30af..023dc5f015c 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -123,7 +123,7 @@ typedef struct Object {
 	short ipowin, scaflag;		/* ipowin: blocktype last ipowindow */
 	short scavisflag, boundtype;
 	
-	short dupon, dupoff, dupsta, dupend;
+	int dupon, dupoff, dupsta, dupend;
 
 	float sf, ctime;
 	
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index f568e2177fd..1a53ca91e8c 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -146,9 +146,8 @@ typedef struct RenderData {
 
 	int cfra, sfra, efra;	/* fames as in 'images' */
 
-        short pad1;
-
-	short images, framapto, flag;
+	int images, framapto;
+	short flag, pad1;
 	float ctime;			/* use for calcutions */
 	float framelen, blurfac;
 
@@ -261,7 +260,7 @@ typedef struct RenderData {
 	/* information on different layers to be rendered */
 	ListBase layers;
 	short actlay, pad;
-	int pad2;
+	int pad2,pad3;
 	
 	/**
 	 * The gamma for the normal rendering. Used when doing
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index ca77a04bd22..e4d59687cfa 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -115,10 +115,10 @@ typedef struct EnvMap {
 	float obimat[3][3];
 	short type, stype;
 	float clipsta, clipend;
-	float viewscale, pad;	/* viewscale is for planar envmaps to zoom in or out */
+	float viewscale;	/* viewscale is for planar envmaps to zoom in or out */
 	unsigned int notlay;
 	short cuberes, depth;
-	short ok, lastframe;
+	int ok, lastframe;
 	short recalc, lastsize;
 } EnvMap;
 
@@ -149,9 +149,11 @@ typedef struct Tex {
 	
 	float cropxmin, cropymin, cropxmax, cropymax;
 	short xrepeat, yrepeat;
-	short extend, len;
+	short extend;
+	short fie_ima;
+	int len;
 	float checkerdist, nabla;
-	short frames, offset, sfra, fie_ima;
+	int frames, offset, sfra;
 	float norfac;
 	
 	struct Ipo *ipo;
@@ -160,7 +162,7 @@ typedef struct Tex {
 	struct ColorBand *coba;
 	struct EnvMap *env;
 	
-	short fradur[4][2];
+	int fradur[4][2];
 	
 } Tex;
 
diff --git a/source/blender/python/api2_2x/sceneRender.c b/source/blender/python/api2_2x/sceneRender.c
index 413c2c6a3f3..873122ced77 100644
--- a/source/blender/python/api2_2x/sceneRender.c
+++ b/source/blender/python/api2_2x/sceneRender.c
@@ -2109,7 +2109,7 @@ PyObject *RenderData_EnableSGICosmo( BPy_RenderData * self, PyObject * args )
 //------------------------------------RenderData.OldMapValue() -----------
 PyObject *RenderData_OldMapValue( BPy_RenderData * self, PyObject * args )
 {
-	PyObject *tmp = M_Render_GetSetAttributeShort(args,
+	PyObject *tmp = M_Render_GetSetAttributeInt(args,
 		&self->renderContext->framapto, 1, 900);
 	self->renderContext->framelen =
 		(float)self->renderContext->framapto / self->renderContext->images;
@@ -2119,7 +2119,7 @@ PyObject *RenderData_OldMapValue( BPy_RenderData * self, PyObject * args )
 //------------------------------------RenderData.NewMapValue() -----------
 PyObject *RenderData_NewMapValue( BPy_RenderData * self, PyObject * args )
 {
-	PyObject *tmp = M_Render_GetSetAttributeShort(args,
+	PyObject *tmp = M_Render_GetSetAttributeInt(args,
 			&self->renderContext->images, 1, 900);
 	self->renderContext->framelen =
 		(float)self->renderContext->framapto / self->renderContext->images;
diff --git a/source/blender/src/buttons_logic.c b/source/blender/src/buttons_logic.c
index 5eb03a99d9c..673ffb4d967 100644
--- a/source/blender/src/buttons_logic.c
+++ b/source/blender/src/buttons_logic.c
@@ -1568,13 +1568,13 @@ static short draw_actuatorbuttons(bActuator *act, uiBlock *block, short xco, sho
 			}
 			else
 			{
-				uiDefButS(block, NUM, 0, "Sta: ",xco+30, yco-64, (width-60)/2, 19, &aa->sta, 0.0, MAXFRAMEF, 0, 0, "Start frame");
-				uiDefButS(block, NUM, 0, "End: ",xco+30+(width-60)/2, yco-64, (width-60)/2, 19, &aa->end, 0.0, MAXFRAMEF, 0, 0, "End frame");
+				uiDefButI(block, NUM, 0, "Sta: ",xco+30, yco-64, (width-60)/2, 19, &aa->sta, 0.0, MAXFRAMEF, 0, 0, "Start frame");
+				uiDefButI(block, NUM, 0, "End: ",xco+30+(width-60)/2, yco-64, (width-60)/2, 19, &aa->end, 0.0, MAXFRAMEF, 0, 0, "End frame");
 			}
 			
 			
 			
-			uiDefButS(block, NUM, 0, "Blendin: ", xco+30, yco-84, (width-60)/2, 19, &aa->blendin, 0.0, MAXFRAMEF, 0.0, 0.0, "Number of frames of motion blending");
+			uiDefButI(block, NUM, 0, "Blendin: ", xco+30, yco-84, (width-60)/2, 19, &aa->blendin, 0.0, MAXFRAMEF, 0.0, 0.0, "Number of frames of motion blending");
 			uiDefButS(block, NUM, 0, "Priority: ", xco+30+(width-60)/2, yco-84, (width-60)/2, 19, &aa->priority, 0.0, 100.0, 0.0, 0.0, "Execution priority - lower numbers will override actions with higher numbers");
 			
 #ifdef __NLA_ACTION_BY_MOTION_ACTUATOR
@@ -1611,11 +1611,11 @@ static short draw_actuatorbuttons(bActuator *act, uiBlock *block, short xco, sho
 					"Use this property to define the Ipo position");
 			}
 			else {
-				uiDefButS(block, NUM, 0, 
+				uiDefButI(block, NUM, 0, 
 					"Sta",		xco+20, yco-44, (width-100)/2, 19, 
 					&ia->sta, 0.0, MAXFRAMEF, 0, 0, 
 					"Start frame");
-				uiDefButS(block, NUM, 0, 
+				uiDefButI(block, NUM, 0, 
 					"End",		xco+18+(width-90)/2, yco-44, (width-100)/2, 19, 
 					&ia->end, 0.0, MAXFRAMEF, 0, 0, 
 					"End frame");
@@ -1970,14 +1970,14 @@ static short draw_actuatorbuttons(bActuator *act, uiBlock *block, short xco, sho
 		uiDefButS(block, MENU, 1, str,			xco+20, yco-24, width-40, 19, &ga->type, 0, 0, 0, 0, "");
 		if(ga->type==ACT_GROUP_SET) {
 			uiDefBut(block, TEX, 0, "Key: ",		xco+20, yco-44, (width-10)/2, 19, ga->name, 0.0, 31.0, 0, 0, "This name defines groupkey to be set");
-			uiDefButS(block, NUM, 0, "Frame:",	xco+20+(width-10)/2, yco-44, (width-70)/2, 19, &ga->sta, 0.0, 2500.0, 0, 0, "Set this frame");
+			uiDefButI(block, NUM, 0, "Frame:",	xco+20+(width-10)/2, yco-44, (width-70)/2, 19, &ga->sta, 0.0, 2500.0, 0, 0, "Set this frame");
 		}
 		else if(ga->type==ACT_GROUP_FROM_PROP) {
 			uiDefBut(block, TEX, 0, "Prop: ",		xco+20, yco-44, width-40, 19, ga->name, 0.0, 31.0, 0, 0, "Use this property to define the Group position");
 		}
 		else {
-			uiDefButS(block, NUM, 0, "Sta",		xco+20, yco-44, (width-40)/2, 19, &ga->sta, 0.0, 2500.0, 0, 0, "Start frame");
-			uiDefButS(block, NUM, 0, "End",		xco+20+(width-40)/2, yco-44, (width-40)/2, 19, &ga->end, 0.0, 2500.0, 0, 0, "End frame");
+			uiDefButI(block, NUM, 0, "Sta",		xco+20, yco-44, (width-40)/2, 19, &ga->sta, 0.0, 2500.0, 0, 0, "Start frame");
+			uiDefButI(block, NUM, 0, "End",		xco+20+(width-40)/2, yco-44, (width-40)/2, 19, &ga->end, 0.0, 2500.0, 0, 0, "End frame");
 		}
 		yco-= ysize;
 		break;
diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c
index 974d94be8cd..93c58860f10 100644
--- a/source/blender/src/buttons_object.c
+++ b/source/blender/src/buttons_object.c
@@ -614,8 +614,8 @@ static void draw_constraint (uiBlock *block, ListBase *list, bConstraint *con, s
 				uiDefButS(block, MENU, B_CONSTRAINT_TEST, "Key on%t|X Rot%x0|Y Rot%x1|Z Rot%x2", *xco+((width/2)-117), *yco-84, 78, 18, &data->type, 0, 24, 0, 0, "Specify which transformation channel from the target is used to key the action");
 
 				uiBlockBeginAlign(block);
-				uiDefButS(block, NUM, B_CONSTRAINT_TEST, "Start:", *xco+((width/2)-36), *yco-64, 78, 18, &data->start, 1, MAXFRAME, 0.0, 0.0, "Starting frame of the keyed motion"); 
-				uiDefButS(block, NUM, B_CONSTRAINT_TEST, "End:", *xco+((width/2)-36), *yco-84, 78, 18, &data->end, 1, MAXFRAME, 0.0, 0.0, "Ending frame of the keyed motion"); 
+				uiDefButI(block, NUM, B_CONSTRAINT_TEST, "Start:", *xco+((width/2)-36), *yco-64, 78, 18, &data->start, 1, MAXFRAME, 0.0, 0.0, "Starting frame of the keyed motion"); 
+				uiDefButI(block, NUM, B_CONSTRAINT_TEST, "End:", *xco+((width/2)-36), *yco-84, 78, 18, &data->end, 1, MAXFRAME, 0.0, 0.0, "Ending frame of the keyed motion"); 
 				
 				uiBlockBeginAlign(block);
 				uiDefButF(block, NUM, B_CONSTRAINT_TEST, "Min:", *xco+((width/2)+45), *yco-64, 78, 18, &data->min, -180, 180, 0, 0, "Minimum value for target channel range");
@@ -1634,10 +1634,10 @@ static void object_panel_anim(Object *ob)
 	uiBlockBeginAlign(block);
 	/* DupSta and DupEnd are both shorts, so the maxframe is greater then their range
 	just limit the buttons to the max short */
-	uiDefButS(block, NUM, REDRAWVIEW3D, "DupSta:",		24,85,141,19, &ob->dupsta, 1.0, 32767, 0, 0, "Specify startframe for Dupliframes");
-	uiDefButS(block, NUM, REDRAWVIEW3D, "DupOn:",		170,85,146,19, &ob->dupon, 1.0, 1500.0, 0, 0, "Specify the number of frames to use between DupOff frames");
-	uiDefButS(block, NUM, REDRAWVIEW3D, "DupEnd",		24,65,140,19, &ob->dupend, 1.0, 32767, 0, 0, "Specify endframe for Dupliframes");
-	uiDefButS(block, NUM, REDRAWVIEW3D, "DupOff",		171,65,145,19, &ob->dupoff, 0.0, 1500.0, 0, 0, "Specify recurring frames to exclude from the Dupliframes");
+	uiDefButI(block, NUM, REDRAWVIEW3D, "DupSta:",		24,85,141,19, &ob->dupsta, 1.0, 32767, 0, 0, "Specify startframe for Dupliframes");
+	uiDefButI(block, NUM, REDRAWVIEW3D, "DupOn:",		170,85,146,19, &ob->dupon, 1.0, 1500.0, 0, 0, "Specify the number of frames to use between DupOff frames");
+	uiDefButI(block, NUM, REDRAWVIEW3D, "DupEnd",		24,65,140,19, &ob->dupend, 1.0, 32767, 0, 0, "Specify endframe for Dupliframes");
+	uiDefButI(block, NUM, REDRAWVIEW3D, "DupOff",		171,65,145,19, &ob->dupoff, 0.0, 1500.0, 0, 0, "Specify recurring frames to exclude from the Dupliframes");
 	uiBlockBeginAlign(block);
 	uiDefButBitS(block, TOG, OB_OFFS_OB, REDRAWALL, "Offs Ob",			24,35,56,20, &ob->ipoflag, 0, 0, 0, 0, "Let the timeoffset work on its own objectipo");
 	uiDefButBitS(block, TOG, OB_OFFS_PARENT, REDRAWALL, "Offs Par",			82,35,56,20 , &ob->ipoflag, 0, 0, 0, 0, "Let the timeoffset work on the parent");
diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c
index bbff35d8e61..81258f7a43f 100644
--- a/source/blender/src/buttons_scene.c
+++ b/source/blender/src/buttons_scene.c
@@ -1941,8 +1941,8 @@ void anim_panels()
 	if(uiNewPanel(curarea, block, "Anim", "Anim", 0, 0, 318, 204)==0) return;
 
 	uiBlockBeginAlign(block);
-	uiDefButS(block, NUM,B_FRAMEMAP,"Map Old:",	10,160,150,20,&G.scene->r.framapto,1.0,900.0, 0, 0, "Specify old mapping value in frames");
-	uiDefButS(block, NUM,B_FRAMEMAP,"Map New:",	160,160,150,20,&G.scene->r.images,1.0,900.0, 0, 0, "Specify how many frames the Map Old will last");
+	uiDefButI(block, NUM,B_FRAMEMAP,"Map Old:",	10,160,150,20,&G.scene->r.framapto,1.0,900.0, 0, 0, "Specify old mapping value in frames");
+	uiDefButI(block, NUM,B_FRAMEMAP,"Map New:",	160,160,150,20,&G.scene->r.images,1.0,900.0, 0, 0, "Specify how many frames the Map Old will last");
 
 	uiBlockBeginAlign(block);
 	uiDefButS(block, NUM,B_FRAMEMAP,"Frs/sec:",  10,130,150,20, &G.scene->r.frs_sec, 1.0, 120.0, 100.0, 0, "Frames per second");
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c
index 344d72587b2..42a0ff1b190 100644
--- a/source/blender/src/buttons_shading.c
+++ b/source/blender/src/buttons_shading.c
@@ -963,22 +963,22 @@ static void texture_panel_image1(Tex *tex)
 	}
 	else uiDefBut(block, LABEL, 0, "<",      802, 110, 20, 18, 0, 0, 0, 0, 0, "");
 			
-	uiDefButS(block, NUM, B_TEXPRV, "Frames :",	642,110,150,19, &tex->frames, 0.0, MAXFRAMEF, 0, 0, "Sets the number of frames of a movie to use and activates animation options");
-	uiDefButS(block, NUM, B_TEXPRV, "Offset :",	642,90,150,19, &tex->offset, -MAXFRAMEF, MAXFRAMEF, 0, 0, "Offsets the number of the first movie frame to use in the animation");
+	uiDefButI(block, NUM, B_TEXPRV, "Frames :",	642,110,150,19, &tex->frames, 0.0, MAXFRAMEF, 0, 0, "Sets the number of frames of a movie to use and activates animation options");
+	uiDefButI(block, NUM, B_TEXPRV, "Offset :",	642,90,150,19, &tex->offset, -MAXFRAMEF, MAXFRAMEF, 0, 0, "Offsets the number of the first movie frame to use in the animation");
 	uiDefButS(block, NUM, B_TEXPRV, "Fie/Ima:",	642,60,98,19, &tex->fie_ima, 1.0, 200.0, 0, 0, "Sets the number of fields per rendered frame");
-	uiDefButS(block, NUM, B_TEXPRV, "StartFr:",	642,30,150,19, &tex->sfra, 1.0, MAXFRAMEF, 0, 0, "Sets the starting frame of the movie to use in animation");
-	uiDefButS(block, NUM, B_TEXPRV, "Len:",		642,10,150,19, &tex->len, 0.0, MAXFRAMEF, 0, 0, "Sets the number of movie frames to use in animation: 0=all");
+	uiDefButI(block, NUM, B_TEXPRV, "StartFr:",	642,30,150,19, &tex->sfra, 1.0, MAXFRAMEF, 0, 0, "Sets the starting frame of the movie to use in animation");
+	uiDefButI(block, NUM, B_TEXPRV, "Len:",		642,10,150,19, &tex->len, 0.0, MAXFRAMEF, 0, 0, "Sets the number of movie frames to use in animation: 0=all");
 	
 	uiBlockBeginAlign(block);
-	uiDefButS(block, NUM, B_TEXPRV, "Fra:",		802,70,73,19, &(tex->fradur[0][0]), 0.0, MAXFRAMEF, 0, 0, "Montage mode: frame start");
-	uiDefButS(block, NUM, B_TEXPRV, "Fra:",		802,50,73,19, &(tex->fradur[1][0]), 0.0, MAXFRAMEF, 0, 0, "Montage mode: frame start");
-	uiDefButS(block, NUM, B_TEXPRV, "Fra:",		802,30,73,19, &(tex->fradur[2][0]), 0.0, MAXFRAMEF, 0, 0, "Montage mode: frame start");
-	uiDefButS(block, NUM, B_TEXPRV, "Fra:",		802,10,73,19, &(tex->fradur[3][0]), 0.0, MAXFRAMEF, 0, 0, "Montage mode: frame start");
+	uiDefButI(block, NUM, B_TEXPRV, "Fra:",		802,70,73,19, &(tex->fradur[0][0]), 0.0, MAXFRAMEF, 0, 0, "Montage mode: frame start");
+	uiDefButI(block, NUM, B_TEXPRV, "Fra:",		802,50,73,19, &(tex->fradur[1][0]), 0.0, MAXFRAMEF, 0, 0, "Montage mode: frame start");
+	uiDefButI(block, NUM, B_TEXPRV, "Fra:",		802,30,73,19, &(tex->fradur[2][0]), 0.0, MAXFRAMEF, 0, 0, "Montage mode: frame start");
+	uiDefButI(block, NUM, B_TEXPRV, "Fra:",		802,10,73,19, &(tex->fradur[3][0]), 0.0, MAXFRAMEF, 0, 0, "Montage mode: frame start");
 	uiBlockBeginAlign(block);
-	uiDefButS(block, NUM, B_TEXPRV, "",			879,70,37,19, &(tex->fradur[0][1]), 0.0, 250.0, 0, 0, "Montage mode: amount of displayed frames");
-	uiDefButS(block, NUM, B_TEXPRV, "",			879,50,37,19, &(tex->fradur[1][1]), 0.0, 250.0, 0, 0, "Montage mode: amount of displayed frames");
-	uiDefButS(block, NUM, B_TEXPRV, "",			879,30,37,19, &(tex->fradur[2][1]), 0.0, 250.0, 0, 0, "Montage mode: amount of displayed frames");
-	uiDefButS(block, NUM, B_TEXPRV, "",			879,10,37,19, &(tex->fradur[3][1]), 0.0, 250.0, 0, 0, "Montage mode: amount of displayed frames");
+	uiDefButI(block, NUM, B_TEXPRV, "",			879,70,37,19, &(tex->fradur[0][1]), 0.0, 250.0, 0, 0, "Montage mode: amount of displayed frames");
+	uiDefButI(block, NUM, B_TEXPRV, "",			879,50,37,19, &(tex->fradur[1][1]), 0.0, 250.0, 0, 0, "Montage mode: amount of displayed frames");
+	uiDefButI(block, NUM, B_TEXPRV, "",			879,30,37,19, &(tex->fradur[2][1]), 0.0, 250.0, 0, 0, "Montage mode: amount of displayed frames");
+	uiDefButI(block, NUM, B_TEXPRV, "",			879,10,37,19, &(tex->fradur[3][1]), 0.0, 250.0, 0, 0, "Montage mode: amount of displayed frames");
 	uiBlockEndAlign(block);
 	uiDefButBitS(block, TOG, TEX_ANIMCYCLIC, B_TEXPRV, "Cyclic",		743,60,48,19, &tex->imaflag, 0, 0, 0, 0, "Toggles looping of animated frames");
 }
diff --git a/source/blender/src/drawnode.c b/source/blender/src/drawnode.c
index 58e08c3f87c..69d880034e8 100644
--- a/source/blender/src/drawnode.c
+++ b/source/blender/src/drawnode.c
@@ -702,14 +702,14 @@ static int node_composit_buts_image(uiBlock *block, bNodeTree *ntree, bNode *nod
 			short width= (short)(butr->xmax-butr->xmin)/2;
 			
 			dy-= 19;
-			uiDefButS(block, NUM, B_NODE_EXEC+node->nr, "Frs:",
+			uiDefButI(block, NUM, B_NODE_EXEC+node->nr, "Frs:",
 					  butr->xmin, dy, width, 19, 
 					  &nia->frames, 0.0, 10000.0, 0, 0, "Amount of images used in animation");
-			uiDefButS(block, NUM, B_NODE_EXEC+node->nr, "SFra:",
+			uiDefButI(block, NUM, B_NODE_EXEC+node->nr, "SFra:",
 					  butr->xmin+width, dy, width, 19, 
 					  &nia->sfra, 1.0, 10000.0, 0, 0, "Start frame of animation");
 			dy-= 19;
-			uiDefButS(block, NUM, B_NODE_EXEC+node->nr, "First:",
+			uiDefButI(block, NUM, B_NODE_EXEC+node->nr, "First:",
 					  butr->xmin, dy, width, 19, 
 					  &nia->nr, 0.0, 10000.0, 0, 0, "Number in image name, used as first in animation");
 			uiDefButC(block, TOG, B_NODE_EXEC+node->nr, "Cycl",