[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12773] trunk/blender/source/blender: Tools

[Ken Hughes]

Revision: 12773
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12773
Author:   khughes
Date:     2007-12-04 00:37:33 +0100 (Tue, 04 Dec 2007)

Log Message:
-----------
Tools
-----
Bugfix #7831: fix image filename extensions on saved files.  Make FFMPEG save JPEG images by default, allow JPEG images to have either ".jpg" or ".jpeg" extension.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/image.c
    trunk/blender/source/blender/src/writeimage.c

Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c	2007-12-03 23:26:45 UTC (rev 12772)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2007-12-03 23:37:33 UTC (rev 12773)
@@ -745,8 +745,8 @@
 		if(!BLI_testextensie(string, ".tga"))
 			extension= ".tga";
 	}
-	else if(ELEM5(imtype, R_MOVIE, R_AVICODEC, R_AVIRAW, R_AVIJPEG, R_JPEG90)) {
-		if(!BLI_testextensie(string, ".jpg"))
+	else if(ELEM6(imtype, R_MOVIE, R_AVICODEC, R_AVIRAW, R_AVIJPEG, R_JPEG90, R_FFMPEG)) {
+		if(!( BLI_testextensie(string, ".jpg") || BLI_testextensie(string, ".jpeg")))
 			extension= ".jpg";
 	}
 	else if(imtype==R_BMP) {

Modified: trunk/blender/source/blender/src/writeimage.c
===================================================================
--- trunk/blender/source/blender/src/writeimage.c	2007-12-03 23:26:45 UTC (rev 12772)
+++ trunk/blender/source/blender/src/writeimage.c	2007-12-03 23:37:33 UTC (rev 12773)
@@ -193,6 +193,7 @@
 			strcpy(str, "Save Multi Layer EXR");
 			break;
 			/* default we save jpeg, also for all movie formats */
+		case R_FFMPEG:
 		case R_JPEG90:
 		case R_MOVIE:
 		case R_AVICODEC: