adding WITH_IMAGE_OPENIMAGEIO and removing the PSD build option

As per Brecht van Lommel's suggestion.

5 files changed, 12 insertions, 12 deletions

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