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/makesrna | |
| 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/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
2 files changed, 3 insertions, 3 deletions
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 |