diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2013-10-11 20:38:04 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2013-10-11 20:38:04 +0400 |
| commit | 029f4b9767d149f10317d060fcc521b8b994c6d5 (patch) | |
| tree | c051b63f159c3eaafab072ded54dfbc478e5cfed /source/blender/imbuf/intern/filetype.c | |
| parent | ce52dc2900b9270fe8b73ca9cf07a3f428d873b7 (diff) | |
adding WITH_IMAGE_OPENIMAGEIO and removing the PSD build option
As per Brecht van Lommel's suggestion.
Diffstat (limited to 'source/blender/imbuf/intern/filetype.c')
| -rw-r--r-- | source/blender/imbuf/intern/filetype.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/imbuf/intern/filetype.c b/source/blender/imbuf/intern/filetype.c index bd642769605..f9e05dbd6d6 100644 --- a/source/blender/imbuf/intern/filetype.c +++ b/source/blender/imbuf/intern/filetype.c @@ -35,12 +35,12 @@ #include "IMB_colormanagement.h" -#ifdef WITH_OPENEXR -#include "openexr/openexr_api.h" +#ifdef WITH_OPENIMAGEIO +#include "oiio/openimageio_api.h" #endif -#ifdef WITH_PSD -#include "oiio/openimageio_api.h" +#ifdef WITH_OPENEXR +#include "openexr/openexr_api.h" #endif #ifdef WITH_DDS @@ -102,7 +102,7 @@ ImFileType IMB_FILE_TYPES[] = { #ifdef WITH_QUICKTIME {quicktime_init, quicktime_exit, imb_is_a_quicktime, NULL, imb_ftype_quicktime, imb_quicktime_decode, NULL, NULL, 0, QUICKTIME, COLOR_ROLE_DEFAULT_BYTE}, #endif -#ifdef WITH_PSD +#ifdef WITH_OPENIMAGEIO {NULL, NULL, NULL, imb_is_a_photoshop, imb_ftype_default, NULL, imb_load_photoshop, NULL, NULL, IM_FTYPE_FLOAT, PSD, COLOR_ROLE_DEFAULT_FLOAT}, #endif {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0} |