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

[Ken Hughes]

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

Log Message:
-----------
Tools
-----
Make FFMPEG image save use PNG format instead of JPEG.

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:37:33 UTC (rev 12773)
+++ trunk/blender/source/blender/blenkernel/intern/image.c	2007-12-04 05:53:32 UTC (rev 12774)
@@ -731,7 +731,7 @@
 		if(!BLI_testextensie(string, ".hdr"))
 			extension= ".hdr";
 	}
-	else if(imtype==R_PNG) {
+	else if(imtype==R_PNG || imtype==R_FFMPEG) {
 		if(!BLI_testextensie(string, ".png"))
 			extension= ".png";
 	}
@@ -745,7 +745,7 @@
 		if(!BLI_testextensie(string, ".tga"))
 			extension= ".tga";
 	}
-	else if(ELEM6(imtype, R_MOVIE, R_AVICODEC, R_AVIRAW, R_AVIJPEG, R_JPEG90, R_FFMPEG)) {
+	else if(ELEM5(imtype, R_MOVIE, R_AVICODEC, R_AVIRAW, R_AVIJPEG, R_JPEG90)) {
 		if(!( BLI_testextensie(string, ".jpg") || BLI_testextensie(string, ".jpeg")))
 			extension= ".jpg";
 	}
@@ -1062,7 +1062,7 @@
 	else if ((imtype==R_RADHDR)) {
 		ibuf->ftype= RADHDR;
 	}
-	else if ((imtype==R_PNG)) {
+	else if (imtype==R_PNG || imtype==R_FFMPEG) {
 		ibuf->ftype= PNG;
 	}
 #ifdef WITH_DDS

Modified: trunk/blender/source/blender/src/writeimage.c
===================================================================
--- trunk/blender/source/blender/src/writeimage.c	2007-12-03 23:37:33 UTC (rev 12773)
+++ trunk/blender/source/blender/src/writeimage.c	2007-12-04 05:53:32 UTC (rev 12774)
@@ -148,6 +148,7 @@
 		case R_RADHDR:
 			strcpy(str, "Save Radiance HDR");
 			break;
+		case R_FFMPEG:
 		case R_PNG:
 			strcpy(str, "Save PNG");
 			break;
@@ -193,7 +194,6 @@
 			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: