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 | |
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')
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_file/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/editors/space_image/CMakeLists.txt | 7 | ||||
-rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/imbuf/IMB_imbuf_types.h | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/filetype.c | 10 | ||||
-rw-r--r-- | source/blender/imbuf/intern/oiio/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/imbuf/intern/util.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 | ||||
-rw-r--r-- | source/blender/python/intern/CMakeLists.txt | 4 |
11 files changed, 24 insertions, 23 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index a11d705398f..01b41eb22cd 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -1250,7 +1250,7 @@ static int do_add_image_extension(char *string, const char imtype, const ImageFo } } #endif -#ifdef WITH_PSD +#ifdef WITH_OPENIMAGEIO else if (imtype == R_IMF_IMTYPE_PSD) { if (!BLI_testextensie(string, ".psd")) extension = ".psd"; diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt index 74f3a425c25..ccf8576d621 100644 --- a/source/blender/editors/space_file/CMakeLists.txt +++ b/source/blender/editors/space_file/CMakeLists.txt @@ -58,8 +58,8 @@ if(WITH_IMAGE_OPENEXR) add_definitions(-DWITH_OPENEXR) endif() -if(WITH_IMAGE_PSD) - add_definitions(-DWITH_PSD) +if(WITH_OPENIMAGEIO) + add_definitions(-DWITH_OPENIMAGEIO) endif() if(WITH_IMAGE_TIFF) diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index fdc1960d128..50d8051a73e 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -50,6 +50,10 @@ if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) endif() +if(WITH_OPENIMAGEIO) + add_definitions(-DWITH_OPENIMAGEIO) +endif() + if(WITH_IMAGE_OPENJPEG) add_definitions(-DWITH_OPENJPEG) endif() @@ -58,9 +62,6 @@ if(WITH_IMAGE_OPENEXR) add_definitions(-DWITH_OPENEXR) endif() -if(WITH_IMAGE_PSD) - add_definitions(-DWITH_PSD) -endif() if(WITH_IMAGE_TIFF) add_definitions(-DWITH_TIFF) endif() diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 40075dea1c1..4025a41b6a7 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -106,8 +106,8 @@ if(WITH_IMAGE_TIFF) endif() -if(WITH_IMAGE_PSD) - add_definitions(-DWITH_PSD) +if(WITH_OPENIMAGEIO) + add_definitions(-DWITH_OPENIMAGEIO) endif() if(WITH_IMAGE_OPENJPEG) diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h index df9101247d5..d20130805c0 100644 --- a/source/blender/imbuf/IMB_imbuf_types.h +++ b/source/blender/imbuf/IMB_imbuf_types.h @@ -180,7 +180,7 @@ typedef struct ImBuf { */ #define IB_CUSTOM_FLAGS_MASK 0x7ff -#ifdef WITH_PSD +#ifdef WITH_OPENIMAGEIO #define PSD (1 << 31) #endif 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} diff --git a/source/blender/imbuf/intern/oiio/CMakeLists.txt b/source/blender/imbuf/intern/oiio/CMakeLists.txt index f5ee5eb6589..5fb8f11602e 100644 --- a/source/blender/imbuf/intern/oiio/CMakeLists.txt +++ b/source/blender/imbuf/intern/oiio/CMakeLists.txt @@ -44,11 +44,11 @@ set(SRC openimageio_api.cpp ) -if(WITH_IMAGE_PSD) +if(WITH_OPENIMAGEIO) list(APPEND INC_SYS ${OPENIMAGEIO_INCLUDE_DIRS} ) - add_definitions(-DWITH_PSD) + add_definitions(-DWITH_OPENIMAGEIO) endif() blender_add_lib(bf_imbuf_openimageio "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 434a1717bc8..ecf6458ac57 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -98,14 +98,14 @@ const char *imb_ext_image[] = { #ifdef WITH_OPENEXR ".exr", #endif -#ifdef WITH_PSD +#ifdef WITH_OPENIMAGEIO ".psd", ".pdd", ".psb", #endif NULL }; const char *imb_ext_image_filepath_only[] = { -#ifdef WITH_PSD +#ifdef WITH_OPENIMAGEIO ".psd", ".pdd", ".psb", #endif NULL diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 3d710917e3d..674b41dfa45 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -166,8 +166,8 @@ if(WITH_IMAGE_OPENEXR) add_definitions(-DWITH_OPENEXR) endif() -if(WITH_IMAGE_PSD) - add_definitions(-DWITH_PSD) +if(WITH_OPENIMAGEIO) + add_definitions(-DWITH_OPENIMAGEIO) endif() if(WITH_IMAGE_TIFF) diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index ff64d4c1775..4d35acc84a0 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -219,7 +219,7 @@ EnumPropertyItem snap_uv_element_items[] = { # define R_IMF_ENUM_TIFF #endif -#ifdef WITH_PSD +#ifdef WITH_OPENIMAGEIO # define R_IMF_ENUM_PSD {R_IMF_IMTYPE_PSD, "PSD", ICON_FILE_IMAGE, "Photosp PSD", \ "Output image in Photoshop PSD format"}, #else diff --git a/source/blender/python/intern/CMakeLists.txt b/source/blender/python/intern/CMakeLists.txt index 072c73d3d49..0f12619a1c0 100644 --- a/source/blender/python/intern/CMakeLists.txt +++ b/source/blender/python/intern/CMakeLists.txt @@ -174,8 +174,8 @@ if(WITH_IMAGE_OPENEXR) add_definitions(-DWITH_OPENEXR) endif() -if(WITH_IMAGE_PSD) - add_definitions(-DWITH_PSD) +if(WITH_OPENIMAGEIO) + add_definitions(-DWITH_OPENIMAGEIO) endif() if(WITH_IMAGE_OPENJPEG) |