1)

The F3 key 'save rendered image' made inconsistant choices to save either
in jpg or tga, when the output panel was indicating to render to movies.
Even worse, it was sometimes saying 'save jpg' and saved a targa!

Made it consistantly save .jpg now, since tga isn't a good common format.

2)
Forgot to commit transform.h for previous bugfix in transform numeric input

3 files changed, 9 insertions, 8 deletions

diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index ddf0daa5f73..da6db1422f7 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -428,12 +428,12 @@ int BKE_write_ibuf(ImBuf *ibuf, char *name, int imtype, int subimtype, int quali
 	else if(imtype==R_HAMX) {
 		ibuf->ftype= AN_hamx;
 	}
-	else if ELEM(imtype, R_JPEG90, R_MOVIE) {
+	else {
+		/* R_JPEG90, R_MOVIE, etc. default we save jpegs */
 		if(quality < 10) quality= 90;
 		ibuf->ftype= JPG|quality;
 		if(ibuf->depth==32) ibuf->depth= 24;	/* unsupported feature only confuses other s/w */
 	}
-	else ibuf->ftype= TGA;
 	
 	BLI_make_existing_file(name);
 	
diff --git a/source/blender/include/transform.h b/source/blender/include/transform.h
index ac04cdc95d5..ab0b16e46a4 100755
--- a/source/blender/include/transform.h
+++ b/source/blender/include/transform.h
@@ -47,7 +47,7 @@ typedef struct NumInput {
     short  idx_max;
     short  flag;        /* Different flags to indicate different behaviors                                */
     float  val[3];       /* Direct value of the input                                                      */
-    short  ctrl[3];      /* Control to indicate what to do with the numbers that are typed                 */
+    int  ctrl[3];      /* Control to indicate what to do with the numbers that are typed                 */
 } NumInput ;
 
 /*
diff --git a/source/blender/src/writeimage.c b/source/blender/src/writeimage.c
index c345028da9a..6d167d858ff 100644
--- a/source/blender/src/writeimage.c
+++ b/source/blender/src/writeimage.c
@@ -200,17 +200,18 @@ void save_image_filesel_str(char *str)
 		case R_HAMX:
 			strcpy(str, "Save HAMX");
 			break;
+		case R_TARGA:
+			strcpy(str, "Save Targa");
+			break;
+			
+			/* default we save jpeg, also for all movie formats */
 		case R_JPEG90:
 		case R_MOVIE:
 		case R_AVICODEC:
 		case R_AVIRAW:
 		case R_AVIJPEG:
-			strcpy(str, "Save JPEG");
-			break;
-			
-		case R_TARGA:	/* default targa */
 		default:
-			strcpy(str, "Save Targa");
+			strcpy(str, "Save JPEG");
 			break;
 	}	
 }