[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60686] trunk/blender: adding WITH_IMAGE_OPENIMAGEIO and removing the PSD build option
Dalai Felinto
dfelinto at gmail.com
Fri Oct 11 18:38:05 CEST 2013
Revision: 60686
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60686
Author: dfelinto
Date: 2013-10-11 16:38:04 +0000 (Fri, 11 Oct 2013)
Log Message:
-----------
adding WITH_IMAGE_OPENIMAGEIO and removing the PSD build option
As per Brecht van Lommel's suggestion.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/editors/space_file/CMakeLists.txt
trunk/blender/source/blender/editors/space_image/CMakeLists.txt
trunk/blender/source/blender/imbuf/CMakeLists.txt
trunk/blender/source/blender/imbuf/IMB_imbuf_types.h
trunk/blender/source/blender/imbuf/intern/filetype.c
trunk/blender/source/blender/imbuf/intern/oiio/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/util.c
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/python/intern/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2013-10-11 15:45:42 UTC (rev 60685)
+++ trunk/blender/CMakeLists.txt 2013-10-11 16:38:04 UTC (rev 60686)
@@ -203,10 +203,10 @@
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 @@
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 @@
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 @@
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 @@
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)
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2013-10-11 15:45:42 UTC (rev 60685)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2013-10-11 16:38:04 UTC (rev 60686)
@@ -1250,7 +1250,7 @@
}
}
#endif
-#ifdef WITH_PSD
+#ifdef WITH_OPENIMAGEIO
else if (imtype == R_IMF_IMTYPE_PSD) {
if (!BLI_testextensie(string, ".psd"))
extension = ".psd";
Modified: trunk/blender/source/blender/editors/space_file/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_file/CMakeLists.txt 2013-10-11 15:45:42 UTC (rev 60685)
+++ trunk/blender/source/blender/editors/space_file/CMakeLists.txt 2013-10-11 16:38:04 UTC (rev 60686)
@@ -58,8 +58,8 @@
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)
Modified: trunk/blender/source/blender/editors/space_image/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/space_image/CMakeLists.txt 2013-10-11 15:45:42 UTC (rev 60685)
+++ trunk/blender/source/blender/editors/space_image/CMakeLists.txt 2013-10-11 16:38:04 UTC (rev 60686)
@@ -50,6 +50,10 @@
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 @@
add_definitions(-DWITH_OPENEXR)
endif()
-if(WITH_IMAGE_PSD)
- add_definitions(-DWITH_PSD)
-endif()
if(WITH_IMAGE_TIFF)
add_definitions(-DWITH_TIFF)
endif()
Modified: trunk/blender/source/blender/imbuf/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/CMakeLists.txt 2013-10-11 15:45:42 UTC (rev 60685)
+++ trunk/blender/source/blender/imbuf/CMakeLists.txt 2013-10-11 16:38:04 UTC (rev 60686)
@@ -106,8 +106,8 @@
endif()
-if(WITH_IMAGE_PSD)
- add_definitions(-DWITH_PSD)
+if(WITH_OPENIMAGEIO)
+ add_definitions(-DWITH_OPENIMAGEIO)
endif()
if(WITH_IMAGE_OPENJPEG)
Modified: trunk/blender/source/blender/imbuf/IMB_imbuf_types.h
===================================================================
--- trunk/blender/source/blender/imbuf/IMB_imbuf_types.h 2013-10-11 15:45:42 UTC (rev 60685)
+++ trunk/blender/source/blender/imbuf/IMB_imbuf_types.h 2013-10-11 16:38:04 UTC (rev 60686)
@@ -180,7 +180,7 @@
*/
#define IB_CUSTOM_FLAGS_MASK 0x7ff
-#ifdef WITH_PSD
+#ifdef WITH_OPENIMAGEIO
#define PSD (1 << 31)
#endif
Modified: trunk/blender/source/blender/imbuf/intern/filetype.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/filetype.c 2013-10-11 15:45:42 UTC (rev 60685)
+++ trunk/blender/source/blender/imbuf/intern/filetype.c 2013-10-11 16:38:04 UTC (rev 60686)
@@ -35,14 +35,14 @@
#include "IMB_colormanagement.h"
+#ifdef WITH_OPENIMAGEIO
+#include "oiio/openimageio_api.h"
+#endif
+
#ifdef WITH_OPENEXR
#include "openexr/openexr_api.h"
#endif
-#ifdef WITH_PSD
-#include "oiio/openimageio_api.h"
-#endif
-
#ifdef WITH_DDS
#include "dds/dds_api.h"
#endif
@@ -102,7 +102,7 @@
#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}
Modified: trunk/blender/source/blender/imbuf/intern/oiio/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/intern/oiio/CMakeLists.txt 2013-10-11 15:45:42 UTC (rev 60685)
+++ trunk/blender/source/blender/imbuf/intern/oiio/CMakeLists.txt 2013-10-11 16:38:04 UTC (rev 60686)
@@ -44,11 +44,11 @@
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}")
Modified: trunk/blender/source/blender/imbuf/intern/util.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/util.c 2013-10-11 15:45:42 UTC (rev 60685)
+++ trunk/blender/source/blender/imbuf/intern/util.c 2013-10-11 16:38:04 UTC (rev 60686)
@@ -98,14 +98,14 @@
#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
Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2013-10-11 15:45:42 UTC (rev 60685)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2013-10-11 16:38:04 UTC (rev 60686)
@@ -166,8 +166,8 @@
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)
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2013-10-11 15:45:42 UTC (rev 60685)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2013-10-11 16:38:04 UTC (rev 60686)
@@ -219,7 +219,7 @@
# 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
Modified: trunk/blender/source/blender/python/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/python/intern/CMakeLists.txt 2013-10-11 15:45:42 UTC (rev 60685)
+++ trunk/blender/source/blender/python/intern/CMakeLists.txt 2013-10-11 16:38:04 UTC (rev 60686)
@@ -174,8 +174,8 @@
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)
More information about the Bf-blender-cvs
mailing list