[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15447] trunk/blender/source/blender/ blenkernel/intern/image.c: Bugfix #17139
Ton Roosendaal
ton at blender.org
Sun Jul 6 11:22:11 CEST 2008
Revision: 15447
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15447
Author: ton
Date: 2008-07-06 11:21:39 +0200 (Sun, 06 Jul 2008)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/image.c
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2008-07-05 22:01:46 UTC (rev 15446)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2008-07-06 09:21:39 UTC (rev 15447)
@@ -848,10 +848,6 @@
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 @@
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);
}
More information about the Bf-blender-cvs
mailing list