diff options
| author | Kent Mein <mein@cs.umn.edu> | 2005-11-22 21:50:03 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2005-11-22 21:50:03 +0300 |
| commit | 00f266c651a52027b662f725d081af6b51aae343 (patch) | |
| tree | 40fd6d4d9a76f1eddcc63e5af6091c1442922dca /source/blender/src/filesel.c | |
| parent | b63e26e109ba8c651ea20f553e3ca8e0604fc73f (diff) | |
This is a modified version of patch #2995
To enable dynamic tiff support.
I had to fix some of the logic in the fileselect box for icons,
I also expanded the patch to look in various default locations for
a dynamic libtiff.so/libtiff.dll
and look at the env variable BF_TIFF_LIB if it can't find it automatically.
If unable to load the library it prints a message about setting BF_TIFF_LIB
to the console.
I haven't been able to test it on a lot of platforms but hopefully it
will just work ;) I added the files to scons but have not had a chance to
test that as well.
Kent
Diffstat (limited to 'source/blender/src/filesel.c')
| -rw-r--r-- | source/blender/src/filesel.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/src/filesel.c b/source/blender/src/filesel.c index 09cf0d8a42e..3b17f0c2c26 100644 --- a/source/blender/src/filesel.c +++ b/source/blender/src/filesel.c @@ -34,10 +34,6 @@ #include <string.h> #include <math.h> -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #ifdef WIN32 #include <io.h> #include <direct.h> @@ -589,6 +585,10 @@ void test_flags_file(SpaceFile *sfile) || BLI_testextensie(file->relname, ".otf") || BLI_testextensie(file->relname, ".otc")) { file->flags |= FTFONTFILE; + } else if (G.have_libtiff && + (BLI_testextensie(file->relname, ".tif") + || BLI_testextensie(file->relname, ".tiff"))) { + file->flags |= IMAGEFILE; } else if (G.have_quicktime){ if( BLI_testextensie(file->relname, ".jpg") || BLI_testextensie(file->relname, ".jpeg") |