griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Tools

Browse Source 
-----
Make FFMPEG image save use PNG format instead of JPEG.
This commit is contained in:
Ken Hughes
2007-12-04 05:53:32 +00:00
parent 62e28f52da
commit 3e544d04b5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/image.c
View File

@@ -731,7 +731,7 @@ void BKE_add_image_extension(char *string, int imtype)
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 @@ void BKE_add_image_extension(char *string, int imtype)
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 @@ int BKE_write_ibuf(ImBuf *ibuf, char *name, int imtype, int subimtype, int quali
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

2
source/blender/src/writeimage.c
View File

@@ -148,6 +148,7 @@ void save_image_filesel_str(char *str)
case R_RADHDR:
strcpy(str, "Save Radiance HDR");
break;
case R_FFMPEG:
case R_PNG:
strcpy(str, "Save PNG");
break;
@@ -193,7 +194,6 @@ void save_image_filesel_str(char *str)
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: