Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2010-01-30 12:14:12 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2010-01-30 12:14:12 +0300
commit7d0885915b1b7724ab08a3542ba2faf5e90be705 (patch)
treeabd767cc95ca647381e5400169fc309d810c30e6 /source/blender/imbuf/intern/dds/dds_api.cpp
parentc005d19c420e51764cc3dafac26f329e9144bb88 (diff)
Fix #20146:
* .tif not loading on newer linux distributions, wasn't looking for libtiff version 4. * fix dds being too verbose when testing if it can open an image file.
Diffstat (limited to 'source/blender/imbuf/intern/dds/dds_api.cpp')
-rw-r--r--source/blender/imbuf/intern/dds/dds_api.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/dds/dds_api.cpp b/source/blender/imbuf/intern/dds/dds_api.cpp
index d7ff4761605..20b77c75841 100644
--- a/source/blender/imbuf/intern/dds/dds_api.cpp
+++ b/source/blender/imbuf/intern/dds/dds_api.cpp
@@ -80,6 +80,10 @@ struct ImBuf *imb_load_dds(unsigned char *mem, int size, int flags)
/* check if DDS is valid and supported */
if (!dds.isValid()) {
+ /* no need to print error here, just testing if it is a DDS */
+ if(flags & IB_test)
+ return (0);
+
printf("DDS: not valid; header follows\n");
dds.printInfo();
return(0);