diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-08-03 15:25:34 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-03 15:25:34 +0400 |
| commit | 957976882d084d9951760b154f414724d6ddb8be (patch) | |
| tree | 9b81d50c17b64575949351ea1c733e90f6b118ae /source/blender/imbuf/intern/util.c | |
| parent | 940d1dcd0a9f88ec5a7b1ec0cf12dc7a6ddddf0b (diff) | |
build options to disable image formats WITH_CINEON, WITH_HDR.
- updated cmake, make & scons.
- renamed CMake build options WITH_TIFF -> WITH_IMAGE_TIFF, same for DDS, OPENJPEG etc.
Diffstat (limited to 'source/blender/imbuf/intern/util.c')
| -rw-r--r-- | source/blender/imbuf/intern/util.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index e6f4e226caa..726a8fe2f36 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -118,7 +118,9 @@ int IMB_ispic(char *filename) || BLI_testextensie(filename, ".tiff") || BLI_testextensie(filename, ".tx") #endif +#ifdef WITH_HDR || BLI_testextensie(filename, ".hdr") +#endif || BLI_testextensie(filename, ".tga") || BLI_testextensie(filename, ".rgb") || BLI_testextensie(filename, ".bmp") @@ -134,7 +136,10 @@ int IMB_ispic(char *filename) || BLI_testextensie(filename, ".pict") || BLI_testextensie(filename, ".pntg") //macpaint || BLI_testextensie(filename, ".qtif") +#ifdef WITH_CINEON + || BLI_testextensie(filename, ".dpx") || BLI_testextensie(filename, ".cin") +#endif #ifdef WITH_BF_OPENEXR || BLI_testextensie(filename, ".exr") #endif @@ -154,12 +159,17 @@ int IMB_ispic(char *filename) || BLI_testextensie(filename, ".tiff") || BLI_testextensie(filename, ".tx") #endif +#ifdef WITH_HDR || BLI_testextensie(filename, ".hdr") +#endif || BLI_testextensie(filename, ".tga") || BLI_testextensie(filename, ".rgb") || BLI_testextensie(filename, ".bmp") || BLI_testextensie(filename, ".png") +#ifdef WITH_CINEON || BLI_testextensie(filename, ".cin") + || BLI_testextensie(filename, ".dpx") +#endif #ifdef WITH_DDS || BLI_testextensie(filename, ".dds") #endif |