From af66a4630dde71b1576e0db0ef2ae284e71e26d5 Mon Sep 17 00:00:00 2001 From: Andrea Weikert Date: Mon, 14 Mar 2011 21:13:30 +0000 Subject: 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. --- source/blender/blenkernel/intern/image.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'source/blender/blenkernel/intern/image.c') diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index bbcc2862900..f7011daaf0e 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -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; -- cgit v1.2.3