archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix [#26478] New image extension is appended to the old one instead of replacing it

Browse Source 
Note: 
Extension is replaced with the new extension if it's a known image extension.
Brings back old behaviour, a little bit refined.
This commit is contained in:
Andrea Weikert
2011-03-14 21:13:30 +00:00
parent 41c27cd6ef
commit af66a4630d
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -850,9 +850,15 @@ int BKE_add_image_extension(char *string, int imtype)
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;