diff options
Diffstat (limited to 'source/blender/editors/space_image')
| -rw-r--r-- | source/blender/editors/space_image/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | source/blender/editors/space_image/Makefile | 7 | ||||
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 4 |
3 files changed, 15 insertions, 4 deletions
diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index 71eebdb9b1e..f644338d39d 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -33,13 +33,13 @@ SET(INC ../../windowmanager ) -IF(WITH_OPENEXR) +IF(WITH_IMAGE_OPENEXR) ADD_DEFINITIONS(-DWITH_OPENEXR) -ENDIF(WITH_OPENEXR) +ENDIF(WITH_IMAGE_OPENEXR) -IF(WITH_TIFF) +IF(WITH_IMAGE_TIFF) ADD_DEFINITIONS(-DWITH_TIFF) -ENDIF(WITH_TIFF) +ENDIF(WITH_IMAGE_TIFF) IF(WITH_LCMS) SET(INC ${INC} ${LCMS_INCLUDE_DIR}) diff --git a/source/blender/editors/space_image/Makefile b/source/blender/editors/space_image/Makefile index 4f532166bc7..cde31085d80 100644 --- a/source/blender/editors/space_image/Makefile +++ b/source/blender/editors/space_image/Makefile @@ -61,3 +61,10 @@ ifeq ($(WHITH_TIFF), true) CPPFLAGS += -DWITH_TIFF endif +ifeq ($(WHITH_CINEON), true) + CPPFLAGS += -DWITH_CINEON +endif + +ifeq ($(WHITH_HDR), true) + CPPFLAGS += -DWITH_HDR +endif
\ No newline at end of file diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index d69c34ad259..4246516b5bc 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -648,9 +648,13 @@ static const EnumPropertyItem image_file_type_items[] = { #ifdef WITH_TIFF {R_TIFF, "TIFF", 0, "Tiff", ""}, #endif +#ifdef WITH_DDS {R_RADHDR, "RADIANCE_HDR", 0, "Radiance HDR", ""}, +#endif +#ifdef WITH_CINEON {R_CINEON, "CINEON", 0, "Cineon", ""}, {R_DPX, "DPX", 0, "DPX", ""}, +#endif #ifdef WITH_OPENEXR {R_OPENEXR, "OPENEXR", 0, "OpenEXR", ""}, /* saving sequences of multilayer won't work, they copy buffers */ |