adding WITH_IMAGE_OPENIMAGEIO and removing the PSD build option

As per Brecht van Lommel's suggestion.

CMakeLists.txt

@@ -203,10 +203,10 @@ option(WITH_MOD_REMESH          "Enable Remesh Modifier" ON)
 option(WITH_MOD_OCEANSIM        "Enable Ocean Modifier" OFF)
 
 # Image format support
+option(WITH_IMAGE_OPENIMAGEIO   "Enable OpenImageIO Support" OFF)
 option(WITH_IMAGE_OPENEXR       "Enable OpenEXR Support (http://www.openexr.com)" ON)
 option(WITH_IMAGE_OPENJPEG      "Enable OpenJpeg Support (http://www.openjpeg.org)" ON)
 option(WITH_IMAGE_TIFF          "Enable LibTIFF Support" ON)
-option(WITH_IMAGE_PSD           "Enable Photoshop PSD Support" ON)
 option(WITH_IMAGE_DDS           "Enable DDS Image Support" ON)
 option(WITH_IMAGE_CINEON        "Enable CINEON and DPX Image Support" ON)
 option(WITH_IMAGE_HDR           "Enable HDR Image Support" ON)
@@ -420,6 +420,10 @@ if(WITH_IMAGE_REDCODE AND ((NOT WITH_IMAGE_OPENJPEG) OR (NOT WITH_CODEC_FFMPEG))
 	message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG and WITH_CODEC_FFMPEG")
 endif()
 
+if(WITH_IMAGE_OPENIMAGEIO)
+	set(WITH_OPENIMAGEIO ON)
+endif()
+
 # python module, needs some different options
 if(WITH_PYTHON_MODULE AND WITH_PLAYER)
 	message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PLAYER to be OFF")
@@ -439,11 +443,6 @@ if(NOT WITH_PYTHON)
 	set(WITH_CYCLES OFF)
 endif()
 
-# auto enable openimageio for photoshop psd
-if(WITH_IMAGE_PSD)
-	set(WITH_OPENIMAGEIO ON)
-endif()
-
 # enable boost for cycles, booleans, audaspace or i18n
 # otherwise if the user disabled
 if(NOT WITH_BOOST)
@@ -2293,6 +2292,7 @@ if(FIRST_RUN)
 	info_cfg_option(WITH_SYSTEM_OPENJPEG)
 
 	info_cfg_text("Image Formats:")
+	info_cfg_option(WITH_IMAGE_OPENIMAGEIO)
 	info_cfg_option(WITH_IMAGE_CINEON)
 	info_cfg_option(WITH_IMAGE_DDS)
 	info_cfg_option(WITH_IMAGE_HDR)
@@ -2300,7 +2300,6 @@ if(FIRST_RUN)
 	info_cfg_option(WITH_IMAGE_OPENJPEG)
 	info_cfg_option(WITH_IMAGE_REDCODE)
 	info_cfg_option(WITH_IMAGE_TIFF)
-	info_cfg_option(WITH_IMAGE_PSD)
 
 	info_cfg_text("Audio:")
 	info_cfg_option(WITH_OPENAL)

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";

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)

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()

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)

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
 

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}

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}")

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

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)

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

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)