[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35544] trunk/blender/source/blender/ blenkernel/intern/image.c: fix [#26478] New image extension is appended to the old one instead of replacing it
Andrea Weikert
elubie at gmx.net
Mon Mar 14 22:13:30 CET 2011
Revision: 35544
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35544
Author: elubie
Date: 2011-03-14 21:13:30 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
fix [#26478] New image extension is appended to the old one instead of replacing it
Note:
Extension is replaced with the new extension if it's a known image extension.
Brings back old behaviour, a little bit refined.
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 2011-03-14 19:56:13 UTC (rev 35543)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2011-03-14 21:13:30 UTC (rev 35544)
@@ -850,9 +850,15 @@
if(extension) {
/* prefer this in many cases to avoid .png.tga, but in certain cases it breaks */
- /* return BLI_replace_extension(string, FILE_MAX, extension); */
- strcat(string, extension);
- return TRUE;
+ /* remove any other known image extension */
+ if(BLI_testextensie_array(string, imb_ext_image)
+ || (G.have_quicktime && BLI_testextensie_array(string, imb_ext_image_qt))) {
+ return BLI_replace_extension(string, FILE_MAX, extension);
+ } else {
+ strcat(string, extension);
+ return TRUE;
+ }
+
}
else {
return FALSE;
More information about the Bf-blender-cvs
mailing list