diff options
| author | Ton Roosendaal <ton@blender.org> | 2008-07-06 13:21:39 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2008-07-06 13:21:39 +0400 |
| commit | 79f858b7958681e3d1fb6a827fdf26a737abfbdd (patch) | |
| tree | 0ee20e1d1ff7a8e6bfd50608c0668040df04c3ca | |
| parent | e6e2087e90417c3a5c4cf934bb2f54f5cc5c214d (diff) | |
Bugfix #17139
When "image type" is a movie, image file saving falls back to jpg as a
default. The code checking extensions didn't correctly include quicktime.
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index c73279746fb..f16269aa50c 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -848,10 +848,6 @@ void BKE_add_image_extension(char *string, int imtype) 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") || BLI_testextensie(string, ".jpeg"))) - extension= ".jpg"; - } else if(imtype==R_BMP) { if(!BLI_testextensie(string, ".bmp")) extension= ".bmp"; @@ -874,10 +870,14 @@ void BKE_add_image_extension(char *string, int imtype) if (!BLI_testextensie(string, ".dpx")) extension= ".dpx"; } - else { /* targa default */ + else if(imtype==R_TARGA) { if(!BLI_testextensie(string, ".tga")) extension= ".tga"; } + else { // R_MOVIE, R_AVICODEC, R_AVIRAW, R_AVIJPEG, R_JPEG90, R_QUICKTIME etc + if(!( BLI_testextensie(string, ".jpg") || BLI_testextensie(string, ".jpeg"))) + extension= ".jpg"; + } strcat(string, extension); } |