griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

CMake: match defines & CMake variable names

Browse Source 
Avoid mistakes with these variables getting mixed up
(see: bf03a2684b).

Ref !137183
This commit is contained in:
Campbell Barton
2025-04-09 08:44:36 +00:00
parent a345f86e33
commit 12f0164eb0
24 changed files with 90 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/CMakeLists.txt
View File

@@ -635,19 +635,19 @@ if(WITH_BULLET)
endif()
if(WITH_IMAGE_OPENEXR)
add_definitions(-DWITH_OPENEXR)
add_definitions(-DWITH_IMAGE_OPENEXR)
endif()
if(WITH_IMAGE_OPENJPEG)
add_definitions(-DWITH_OPENJPEG)
add_definitions(-DWITH_IMAGE_OPENJPEG)
endif()
if(WITH_IMAGE_CINEON)
add_definitions(-DWITH_CINEON)
add_definitions(-DWITH_IMAGE_CINEON)
endif()
if(WITH_IMAGE_WEBP)
add_definitions(-DWITH_WEBP)
add_definitions(-DWITH_IMAGE_WEBP)
endif()
if(WITH_CODEC_FFMPEG)

4
source/blender/blenkernel/intern/dynamicpaint.cc
View File

@@ -3308,7 +3308,7 @@ void dynamicPaint_outputSurfaceImage(DynamicPaintSurface *surface,
return;
}
/* if selected format is openexr, but current build doesn't support one */
#ifndef WITH_OPENEXR
#ifndef WITH_IMAGE_OPENEXR
if (format == R_IMF_IMTYPE_OPENEXR) {
format = R_IMF_IMTYPE_PNG;
}
@@ -3407,7 +3407,7 @@ void dynamicPaint_outputSurfaceImage(DynamicPaintSurface *surface,
}
/* Set output format, PNG in case EXR isn't supported. */
#ifdef WITH_OPENEXR
#ifdef WITH_IMAGE_OPENEXR
if (format == R_IMF_IMTYPE_OPENEXR) { /* OpenEXR 32-bit float */
ibuf->ftype = IMB_FTYPE_OPENEXR;
ibuf->foptions.flag = R_IMF_EXR_CODEC_ZIP;

8
source/blender/blenkernel/intern/image.cc
View File

@@ -3962,7 +3962,7 @@ void BKE_image_release_renderresult(Scene *scene, Image *ima, RenderResult *rend
bool BKE_image_is_openexr(Image *ima)
{
#ifdef WITH_OPENEXR
#ifdef WITH_IMAGE_OPENEXR
if (ELEM(ima->source, IMA_SRC_FILE, IMA_SRC_SEQUENCE, IMA_SRC_TILED)) {
return BLI_path_extension_check(ima->filepath, ".exr");
}
@@ -4048,7 +4048,7 @@ static void image_add_view(Image *ima, const char *viewname, const char *filepat
/* After imbuf load, OpenEXR type can return with a EXR-handle open
* in that case we have to build a render-result. */
#ifdef WITH_OPENEXR
#ifdef WITH_IMAGE_OPENEXR
static void image_create_multilayer(Image *ima, ImBuf *ibuf, int framenr)
{
const char *colorspace = ima->colorspace_settings.name;
@@ -4070,7 +4070,7 @@ static void image_create_multilayer(Image *ima, ImBuf *ibuf, int framenr)
/* set proper views */
image_init_multilayer_multiview(ima, ima->rr);
}
#endif /* WITH_OPENEXR */
#endif /* WITH_IMAGE_OPENEXR */
/** Common stuff to do with images after loading. */
static void image_init_after_load(Image *ima, ImageUser *iuser, ImBuf * /*ibuf*/)
@@ -4328,7 +4328,7 @@ static ImBuf *load_image_single(Image *ima,
}
if (ibuf) {
#ifdef WITH_OPENEXR
#ifdef WITH_IMAGE_OPENEXR
if (ibuf->ftype == IMB_FTYPE_OPENEXR && ibuf->userdata) {
/* Handle multilayer and multiview cases, don't assign ibuf here.
* will be set layer in BKE_image_acquire_ibuf from ima->rr. */

44
source/blender/blenkernel/intern/image_format.cc
View File

@@ -157,7 +157,7 @@ int BKE_imtype_to_ftype(const char imtype, ImbFormatOptions *r_options)
r_options->quality = 90;
return IMB_FTYPE_OPENEXR;
}
#ifdef WITH_CINEON
#ifdef WITH_IMAGE_CINEON
if (imtype == R_IMF_IMTYPE_CINEON) {
return IMB_FTYPE_CINEON;
}
@@ -165,14 +165,14 @@ int BKE_imtype_to_ftype(const char imtype, ImbFormatOptions *r_options)
return IMB_FTYPE_DPX;
}
#endif
#ifdef WITH_OPENJPEG
#ifdef WITH_IMAGE_OPENJPEG
if (imtype == R_IMF_IMTYPE_JP2) {
r_options->flag |= JP2_JP2;
r_options->quality = 90;
return IMB_FTYPE_JP2;
}
#endif
#ifdef WITH_WEBP
#ifdef WITH_IMAGE_WEBP
if (imtype == R_IMF_IMTYPE_WEBP) {
r_options->quality = 90;
return IMB_FTYPE_WEBP;
@@ -209,7 +209,7 @@ char BKE_ftype_to_imtype(const int ftype, const ImbFormatOptions *options)
if (ftype == IMB_FTYPE_OPENEXR) {
return R_IMF_IMTYPE_OPENEXR;
}
#ifdef WITH_CINEON
#ifdef WITH_IMAGE_CINEON
if (ftype == IMB_FTYPE_CINEON) {
return R_IMF_IMTYPE_CINEON;
}
@@ -224,12 +224,12 @@ char BKE_ftype_to_imtype(const int ftype, const ImbFormatOptions *options)
return R_IMF_IMTYPE_TARGA;
}
#ifdef WITH_OPENJPEG
#ifdef WITH_IMAGE_OPENJPEG
if (ftype == IMB_FTYPE_JP2) {
return R_IMF_IMTYPE_JP2;
}
#endif
#ifdef WITH_WEBP
#ifdef WITH_IMAGE_WEBP
if (ftype == IMB_FTYPE_WEBP) {
return R_IMF_IMTYPE_WEBP;
}
@@ -421,7 +421,7 @@ char BKE_imtype_from_arg(const char *imtype_arg)
if (STREQ(imtype_arg, "TIFF")) {
return R_IMF_IMTYPE_TIFF;
}
#ifdef WITH_OPENEXR
#ifdef WITH_IMAGE_OPENEXR
if (STREQ(imtype_arg, "OPEN_EXR")) {
return R_IMF_IMTYPE_OPENEXR;
}
@@ -440,7 +440,7 @@ char BKE_imtype_from_arg(const char *imtype_arg)
return R_IMF_IMTYPE_FFMPEG;
}
#endif
#ifdef WITH_CINEON
#ifdef WITH_IMAGE_CINEON
if (STREQ(imtype_arg, "CINEON")) {
return R_IMF_IMTYPE_CINEON;
}
@@ -448,12 +448,12 @@ char BKE_imtype_from_arg(const char *imtype_arg)
return R_IMF_IMTYPE_DPX;
}
#endif
#ifdef WITH_OPENJPEG
#ifdef WITH_IMAGE_OPENJPEG
if (STREQ(imtype_arg, "JP2")) {
return R_IMF_IMTYPE_JP2;
}
#endif
#ifdef WITH_WEBP
#ifdef WITH_IMAGE_WEBP
if (STREQ(imtype_arg, "WEBP")) {
return R_IMF_IMTYPE_WEBP;
}
@@ -506,12 +506,12 @@ static int image_path_ext_from_imformat_impl(const char imtype,
else if (imtype == R_IMF_IMTYPE_PSD) {
r_ext[ext_num++] = ".psd";
}
#ifdef WITH_OPENEXR
#ifdef WITH_IMAGE_OPENEXR
else if (ELEM(imtype, R_IMF_IMTYPE_OPENEXR, R_IMF_IMTYPE_MULTILAYER)) {
r_ext[ext_num++] = ".exr";
}
#endif
#ifdef WITH_CINEON
#ifdef WITH_IMAGE_CINEON
else if (imtype == R_IMF_IMTYPE_CINEON) {
r_ext[ext_num++] = ".cin";
}
@@ -519,7 +519,7 @@ static int image_path_ext_from_imformat_impl(const char imtype,
r_ext[ext_num++] = ".dpx";
}
#endif
#ifdef WITH_OPENJPEG
#ifdef WITH_IMAGE_OPENJPEG
else if (imtype == R_IMF_IMTYPE_JP2) {
if (im_format) {
if (im_format->jp2_codec == R_IMF_JP2_CODEC_JP2) {
@@ -537,7 +537,7 @@ static int image_path_ext_from_imformat_impl(const char imtype,
}
}
#endif
#ifdef WITH_WEBP
#ifdef WITH_IMAGE_WEBP
else if (imtype == R_IMF_IMTYPE_WEBP) {
r_ext[ext_num++] = ".webp";
}
@@ -712,7 +712,7 @@ void BKE_image_format_to_imbuf(ImBuf *ibuf, const ImageFormatData *imf)
ibuf->foptions.flag |= TIF_COMPRESS_PACKBITS;
}
}
#ifdef WITH_OPENEXR
#ifdef WITH_IMAGE_OPENEXR
else if (ELEM(imtype, R_IMF_IMTYPE_OPENEXR, R_IMF_IMTYPE_MULTILAYER)) {
ibuf->ftype = IMB_FTYPE_OPENEXR;
if (imf->depth == R_IMF_CHAN_DEPTH_16) {
@@ -722,7 +722,7 @@ void BKE_image_format_to_imbuf(ImBuf *ibuf, const ImageFormatData *imf)
ibuf->foptions.quality = quality;
}
#endif
#ifdef WITH_CINEON
#ifdef WITH_IMAGE_CINEON
else if (imtype == R_IMF_IMTYPE_CINEON) {
ibuf->ftype = IMB_FTYPE_CINEON;
if (imf->cineon_flag & R_IMF_CINEON_FLAG_LOG) {
@@ -761,7 +761,7 @@ void BKE_image_format_to_imbuf(ImBuf *ibuf, const ImageFormatData *imf)
ibuf->ftype = IMB_FTYPE_TGA;
ibuf->foptions.flag = RAWTGA;
}
#ifdef WITH_OPENJPEG
#ifdef WITH_IMAGE_OPENJPEG
else if (imtype == R_IMF_IMTYPE_JP2) {
if (quality < 10) {
quality = 90;
@@ -798,7 +798,7 @@ void BKE_image_format_to_imbuf(ImBuf *ibuf, const ImageFormatData *imf)
}
}
#endif
#ifdef WITH_WEBP
#ifdef WITH_IMAGE_WEBP
else if (imtype == R_IMF_IMTYPE_WEBP) {
ibuf->ftype = IMB_FTYPE_WEBP;
ibuf->foptions.quality = quality;
@@ -905,7 +905,7 @@ void BKE_image_format_from_imbuf(ImageFormatData *im_format, const ImBuf *imbuf)
}
}
#ifdef WITH_OPENEXR
#ifdef WITH_IMAGE_OPENEXR
else if (ftype == IMB_FTYPE_OPENEXR) {
im_format->imtype = R_IMF_IMTYPE_OPENEXR;
char exr_codec = custom_flags & OPENEXR_CODEC_MASK;
@@ -923,7 +923,7 @@ void BKE_image_format_from_imbuf(ImageFormatData *im_format, const ImBuf *imbuf)
}
#endif
#ifdef WITH_CINEON
#ifdef WITH_IMAGE_CINEON
else if (ftype == IMB_FTYPE_CINEON) {
im_format->imtype = R_IMF_IMTYPE_CINEON;
}
@@ -939,7 +939,7 @@ void BKE_image_format_from_imbuf(ImageFormatData *im_format, const ImBuf *imbuf)
im_format->imtype = R_IMF_IMTYPE_TARGA;
}
}
#ifdef WITH_OPENJPEG
#ifdef WITH_IMAGE_OPENJPEG
else if (ftype == IMB_FTYPE_JP2) {
im_format->imtype = R_IMF_IMTYPE_JP2;
im_format->quality = quality;
@@ -975,7 +975,7 @@ void BKE_image_format_from_imbuf(ImageFormatData *im_format, const ImBuf *imbuf)
}
}
#endif
#ifdef WITH_WEBP
#ifdef WITH_IMAGE_WEBP
else if (ftype == IMB_FTYPE_WEBP) {
im_format->imtype = R_IMF_IMTYPE_WEBP;
im_format->quality = quality;

6
source/blender/blenkernel/intern/movieclip.cc
View File

@@ -463,7 +463,7 @@ static void get_proxy_filepath(const MovieClip *clip,
BLI_strncat(filepath, ".jpg", FILE_MAX);
}
#ifdef WITH_OPENEXR
#ifdef WITH_IMAGE_OPENEXR
namespace {
@@ -511,14 +511,14 @@ static void movieclip_convert_multilayer_add_pass(void * /*layer*/,
}
}
#endif /* WITH_OPENEXR */
#endif /* WITH_IMAGE_OPENEXR */
void BKE_movieclip_convert_multilayer_ibuf(ImBuf *ibuf)
{
if (ibuf == nullptr) {
return;
}
#ifdef WITH_OPENEXR
#ifdef WITH_IMAGE_OPENEXR
if (ibuf->ftype != IMB_FTYPE_OPENEXR || ibuf->userdata == nullptr) {
return;
}

8
source/blender/editors/space_file/CMakeLists.txt
View File

@@ -69,19 +69,19 @@ else()
endif()
if(WITH_IMAGE_OPENEXR)
add_definitions(-DWITH_OPENEXR)
add_definitions(-DWITH_IMAGE_OPENEXR)
endif()
if(WITH_IMAGE_OPENJPEG)
add_definitions(-DWITH_OPENJPEG)
add_definitions(-DWITH_IMAGE_OPENJPEG)
endif()
if(WITH_IMAGE_CINEON)
add_definitions(-DWITH_CINEON)
add_definitions(-DWITH_IMAGE_CINEON)
endif()
if(WITH_IMAGE_WEBP)
add_definitions(-DWITH_WEBP)
add_definitions(-DWITH_IMAGE_WEBP)
endif()
if(WITH_FREESTYLE)

8
source/blender/editors/space_image/CMakeLists.txt
View File

@@ -47,19 +47,19 @@ set(LIB
)
if(WITH_IMAGE_OPENJPEG)
add_definitions(-DWITH_OPENJPEG)
add_definitions(-DWITH_IMAGE_OPENJPEG)
endif()
if(WITH_IMAGE_OPENEXR)
add_definitions(-DWITH_OPENEXR)
add_definitions(-DWITH_IMAGE_OPENEXR)
endif()
if(WITH_IMAGE_CINEON)
add_definitions(-DWITH_CINEON)
add_definitions(-DWITH_IMAGE_CINEON)
endif()
if(WITH_IMAGE_WEBP)
add_definitions(-DWITH_WEBP)
add_definitions(-DWITH_IMAGE_WEBP)
endif()

8
source/blender/imbuf/CMakeLists.txt
View File

@@ -88,7 +88,7 @@ if(WITH_IMAGE_OPENEXR)
list(APPEND LIB
bf_imbuf_openexr
)
add_definitions(-DWITH_OPENEXR)
add_definitions(-DWITH_IMAGE_OPENEXR)
else()
list(APPEND SRC
intern/openexr/openexr_stub.cpp
@@ -115,7 +115,7 @@ if(WITH_IMAGE_OPENJPEG)
${OPENJPEG_LIBRARIES}
)
add_definitions(-DWITH_OPENJPEG ${OPENJPEG_DEFINES})
add_definitions(-DWITH_IMAGE_OPENJPEG ${OPENJPEG_DEFINES})
endif()
if(WITH_IMAGE_CINEON)
@@ -125,7 +125,7 @@ if(WITH_IMAGE_CINEON)
list(APPEND LIB
bf_imbuf_cineon
)
add_definitions(-DWITH_CINEON)
add_definitions(-DWITH_IMAGE_CINEON)
endif()
if(WITH_IMAGE_WEBP)
@@ -138,7 +138,7 @@ if(WITH_IMAGE_WEBP)
list(APPEND LIB
${WEBP_LIBRARIES}
)
add_definitions(-DWITH_WEBP)
add_definitions(-DWITH_IMAGE_WEBP)
endif()
list(APPEND INC

6
source/blender/imbuf/IMB_imbuf_enums.h
View File

@@ -22,18 +22,18 @@ enum eImbFileType {
IMB_FTYPE_OPENEXR = 5,
IMB_FTYPE_IRIS = 6,
IMB_FTYPE_PSD = 7,
#ifdef WITH_OPENJPEG
#ifdef WITH_IMAGE_OPENJPEG
IMB_FTYPE_JP2 = 8,
#endif
IMB_FTYPE_RADHDR = 9,
IMB_FTYPE_TIF = 10,
#ifdef WITH_CINEON
#ifdef WITH_IMAGE_CINEON
IMB_FTYPE_CINEON = 11,
IMB_FTYPE_DPX = 12,
#endif
IMB_FTYPE_DDS = 13,
#ifdef WITH_WEBP
#ifdef WITH_IMAGE_WEBP
IMB_FTYPE_WEBP = 14,
#endif
};

4
source/blender/imbuf/IMB_imbuf_types.hh
View File

@@ -39,14 +39,14 @@ struct IDProperty;
/* Lowest bits of foptions.flag / exr_codec contain actual codec enum. */
#define OPENEXR_CODEC_MASK (0xF)
#ifdef WITH_CINEON
#ifdef WITH_IMAGE_CINEON
# define CINEON_LOG (1 << 8)
# define CINEON_16BIT (1 << 7)
# define CINEON_12BIT (1 << 6)
# define CINEON_10BIT (1 << 5)
#endif
#ifdef WITH_OPENJPEG
#ifdef WITH_IMAGE_OPENJPEG
# define JP2_12BIT (1 << 9)
# define JP2_16BIT (1 << 8)
# define JP2_YCC (1 << 7)

2
source/blender/imbuf/intern/cineon/CMakeLists.txt
View File

@@ -33,7 +33,7 @@ set(LIB
)
if(WITH_IMAGE_CINEON)
add_definitions(-DWITH_CINEON)
add_definitions(-DWITH_IMAGE_CINEON)
endif()
blender_add_lib(bf_imbuf_cineon "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

10
source/blender/imbuf/intern/filetype.cc
View File

@@ -17,7 +17,7 @@
#include "oiio/openimageio_api.h"
#ifdef WITH_OPENEXR
#ifdef WITH_IMAGE_OPENEXR
# include "openexr/openexr_api.h"
#endif
@@ -82,7 +82,7 @@ const ImFileType IMB_FILE_TYPES[] = {
/*filetype*/ IMB_FTYPE_IRIS,
/*default_save_role*/ COLOR_ROLE_DEFAULT_BYTE,
},
#ifdef WITH_CINEON
#ifdef WITH_IMAGE_CINEON
{
/*init*/ nullptr,
/*exit*/ nullptr,
@@ -132,7 +132,7 @@ const ImFileType IMB_FILE_TYPES[] = {
/*filetype*/ IMB_FTYPE_RADHDR,
/*default_save_role*/ COLOR_ROLE_DEFAULT_FLOAT,
},
#ifdef WITH_OPENEXR
#ifdef WITH_IMAGE_OPENEXR
{
/*init*/ imb_initopenexr,
/*exit*/ imb_exitopenexr,
@@ -146,7 +146,7 @@ const ImFileType IMB_FILE_TYPES[] = {
/*default_save_role*/ COLOR_ROLE_DEFAULT_FLOAT,
},
#endif
#ifdef WITH_OPENJPEG
#ifdef WITH_IMAGE_OPENJPEG
{
/*init*/ nullptr,
/*exit*/ nullptr,
@@ -184,7 +184,7 @@ const ImFileType IMB_FILE_TYPES[] = {
/*filetype*/ IMB_FTYPE_PSD,
/*default_save_role*/ COLOR_ROLE_DEFAULT_FLOAT,
},
#ifdef WITH_WEBP
#ifdef WITH_IMAGE_WEBP
{
/*init*/ nullptr,
/*exit*/ nullptr,

2
source/blender/imbuf/intern/openexr/CMakeLists.txt
View File

@@ -32,7 +32,7 @@ if(WITH_IMAGE_OPENEXR)
list(APPEND LIB
${OPENEXR_LIBRARIES}
)
add_definitions(-DWITH_OPENEXR)
add_definitions(-DWITH_IMAGE_OPENEXR)
if(WIN32)
if(EXISTS ${LIBDIR}/imath/bin/imath.dll)
add_definitions(-DIMATH_DLL)

8
source/blender/imbuf/intern/util.cc
View File

@@ -52,7 +52,7 @@ const char *imb_ext_image[] = {
* supported by various render engines texture caching systems.
* These are typically TIFF or EXR images. See the tool `maketx` from OpenImageIO. */
".tx",
#ifdef WITH_OPENJPEG
#ifdef WITH_IMAGE_OPENJPEG
/* #IMB_FTYPE_JP2 */
".jp2",
".j2c",
@@ -61,13 +61,13 @@ const char *imb_ext_image[] = {
".hdr",
/* #IMB_FTYPE_DDS */
".dds",
#ifdef WITH_CINEON
#ifdef WITH_IMAGE_CINEON
/* #IMB_FTYPE_DPX */
".dpx",
/* #IMB_FTYPE_CINEON */
".cin",
#endif
#ifdef WITH_OPENEXR
#ifdef WITH_IMAGE_OPENEXR
/* #IMB_FTYPE_EXR */
".exr",
#endif
@@ -75,7 +75,7 @@ const char *imb_ext_image[] = {
".psd",
".pdd",
".psb",
#ifdef WITH_WEBP
#ifdef WITH_IMAGE_WEBP
/* #IMB_FTYPE_WEBP */
".webp",
#endif

2
source/blender/makesrna/RNA_enum_items.hh
View File

@@ -74,7 +74,7 @@ DEF_ENUM(rna_enum_stereo3d_display_items)
DEF_ENUM(rna_enum_stereo3d_anaglyph_type_items)
DEF_ENUM(rna_enum_stereo3d_interlace_type_items)
#ifdef WITH_OPENEXR
#ifdef WITH_IMAGE_OPENEXR
DEF_ENUM(rna_enum_exr_codec_items)
#endif
DEF_ENUM(rna_enum_color_sets_items)

8
source/blender/makesrna/intern/CMakeLists.txt
View File

@@ -287,19 +287,19 @@ if(WITH_PYTHON)
endif()
if(WITH_IMAGE_OPENEXR)
add_definitions(-DWITH_OPENEXR)
add_definitions(-DWITH_IMAGE_OPENEXR)
endif()
if(WITH_IMAGE_OPENJPEG)
add_definitions(-DWITH_OPENJPEG)
add_definitions(-DWITH_IMAGE_OPENJPEG)
endif()
if(WITH_IMAGE_CINEON)
add_definitions(-DWITH_CINEON)
add_definitions(-DWITH_IMAGE_CINEON)
endif()
if(WITH_IMAGE_WEBP)
add_definitions(-DWITH_WEBP)
add_definitions(-DWITH_IMAGE_WEBP)
endif()
if(WITH_AUDASPACE)

2
source/blender/makesrna/intern/rna_dynamicpaint.cc
View File

@@ -347,7 +347,7 @@ static void rna_def_canvas_surface(BlenderRNA *brna)
/* Displace-map file format. */
static const EnumPropertyItem prop_dynamicpaint_image_fileformat[] = {
{MOD_DPAINT_IMGFORMAT_PNG, "PNG", 0, "PNG", ""},
# ifdef WITH_OPENEXR
# ifdef WITH_IMAGE_OPENEXR
{MOD_DPAINT_IMGFORMAT_OPENEXR, "OPENEXR", 0, "OpenEXR", ""},
# endif
{0, nullptr, 0, nullptr, nullptr},

18
source/blender/makesrna/intern/rna_scene.cc
View File

@@ -40,7 +40,7 @@
#include "BLI_threads.h"
#ifdef WITH_OPENEXR
#ifdef WITH_IMAGE_OPENEXR
const EnumPropertyItem rna_enum_exr_codec_items[] = {
{R_IMF_EXR_CODEC_NONE, "NONE", 0, "None", "No compression"},
{R_IMF_EXR_CODEC_ZIP, "ZIP", 0, "ZIP", "Lossless zip compression of 16 row image blocks"},
@@ -273,7 +273,7 @@ const EnumPropertyItem rna_enum_curve_fit_method_items[] = {
{R_IMF_IMTYPE_DDS, "DDS", ICON_FILE_IMAGE, "DDS", "Output image in DDS format"},
#endif
#ifdef WITH_OPENJPEG
#ifdef WITH_IMAGE_OPENJPEG
# define R_IMF_ENUM_JPEG2K \
{R_IMF_IMTYPE_JP2, \
"JPEG2000", \
@@ -284,7 +284,7 @@ const EnumPropertyItem rna_enum_curve_fit_method_items[] = {
# define R_IMF_ENUM_JPEG2K
#endif
#ifdef WITH_CINEON
#ifdef WITH_IMAGE_CINEON
# define R_IMF_ENUM_CINEON \
{R_IMF_IMTYPE_CINEON, "CINEON", ICON_FILE_IMAGE, "Cineon", "Output image in Cineon format"},
# define R_IMF_ENUM_DPX \
@@ -294,7 +294,7 @@ const EnumPropertyItem rna_enum_curve_fit_method_items[] = {
# define R_IMF_ENUM_DPX
#endif
#ifdef WITH_OPENEXR
#ifdef WITH_IMAGE_OPENEXR
# define R_IMF_ENUM_EXR_MULTILAYER \
{R_IMF_IMTYPE_MULTILAYER, \
"OPEN_EXR_MULTILAYER", \
@@ -322,7 +322,7 @@ const EnumPropertyItem rna_enum_curve_fit_method_items[] = {
#define R_IMF_ENUM_TIFF \
{R_IMF_IMTYPE_TIFF, "TIFF", ICON_FILE_IMAGE, "TIFF", "Output image in TIFF format"},
#ifdef WITH_WEBP
#ifdef WITH_IMAGE_WEBP
# define R_IMF_ENUM_WEBP \
{R_IMF_IMTYPE_WEBP, "WEBP", ICON_FILE_IMAGE, "WebP", "Output image in WebP format"},
#else
@@ -1524,7 +1524,7 @@ static const EnumPropertyItem *rna_ImageFormatSettings_views_format_itemf(bConte
}
}
# ifdef WITH_OPENEXR
# ifdef WITH_IMAGE_OPENEXR
/* OpenEXR */
static const EnumPropertyItem *rna_ImageFormatSettings_exr_codec_itemf(bContext * /*C*/,
@@ -6231,7 +6231,7 @@ static void rna_def_image_format_stereo3d_format(BlenderRNA *brna)
static void rna_def_scene_image_format_data(BlenderRNA *brna)
{
# ifdef WITH_OPENJPEG
# ifdef WITH_IMAGE_OPENJPEG
static const EnumPropertyItem jp2_codec_items[] = {
{R_IMF_JP2_CODEC_JP2, "JP2", 0, "JP2", ""},
{R_IMF_JP2_CODEC_J2K, "J2K", 0, "J2K", ""},
@@ -6319,7 +6319,7 @@ static void rna_def_scene_image_format_data(BlenderRNA *brna)
/* format specific */
# ifdef WITH_OPENEXR
# ifdef WITH_IMAGE_OPENEXR
/* OpenEXR */
prop = RNA_def_property(srna, "exr_codec", PROP_ENUM, PROP_NONE);
@@ -6330,7 +6330,7 @@ static void rna_def_scene_image_format_data(BlenderRNA *brna)
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, nullptr);
# endif
# ifdef WITH_OPENJPEG
# ifdef WITH_IMAGE_OPENJPEG
/* JPEG 2000 */
prop = RNA_def_property(srna, "use_jpeg2k_ycc", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "jp2_flag", R_IMF_JP2_FLAG_YCC);

2
source/blender/nodes/CMakeLists.txt
View File

@@ -183,7 +183,7 @@ if(WITH_TBB)
endif()
if(WITH_IMAGE_OPENEXR)
add_definitions(-DWITH_OPENEXR)
add_definitions(-DWITH_IMAGE_OPENEXR)
endif()
if(WITH_FREESTYLE)

2
source/blender/nodes/composite/CMakeLists.txt
View File

@@ -142,7 +142,7 @@ if(WITH_OPENCOLORIO)
endif()
if(WITH_IMAGE_OPENEXR)
add_definitions(-DWITH_OPENEXR)
add_definitions(-DWITH_IMAGE_OPENEXR)
endif()
if(WITH_OPENIMAGEDENOISE)

2
source/blender/nodes/geometry/CMakeLists.txt
View File

@@ -324,7 +324,7 @@ if(WITH_TBB)
endif()
if(WITH_IMAGE_OPENEXR)
add_definitions(-DWITH_OPENEXR)
add_definitions(-DWITH_IMAGE_OPENEXR)
endif()
if(WITH_OPENSUBDIV)

8
source/blender/python/intern/CMakeLists.txt
View File

@@ -228,19 +228,19 @@ if(WITH_FREESTYLE)
endif()
if(WITH_IMAGE_CINEON)
add_definitions(-DWITH_CINEON)
add_definitions(-DWITH_IMAGE_CINEON)
endif()
if(WITH_IMAGE_OPENEXR)
add_definitions(-DWITH_OPENEXR)
add_definitions(-DWITH_IMAGE_OPENEXR)
endif()
if(WITH_IMAGE_OPENJPEG)
add_definitions(-DWITH_OPENJPEG)
add_definitions(-DWITH_IMAGE_OPENJPEG)
endif()
if(WITH_IMAGE_WEBP)
add_definitions(-DWITH_WEBP)
add_definitions(-DWITH_IMAGE_WEBP)
endif()
if(WITH_INPUT_NDOF)

8
source/blender/python/intern/bpy_app_build_options.cc
View File

@@ -125,7 +125,7 @@ static PyObject *make_builtopts_info()
SetObjIncref(Py_False);
#endif
#ifdef WITH_CINEON
#ifdef WITH_IMAGE_CINEON
SetObjIncref(Py_True);
#else
SetObjIncref(Py_False);
@@ -137,13 +137,13 @@ static PyObject *make_builtopts_info()
/* HDR */
SetObjIncref(Py_True);
#ifdef WITH_OPENEXR
#ifdef WITH_IMAGE_OPENEXR
SetObjIncref(Py_True);
#else
SetObjIncref(Py_False);
#endif
#ifdef WITH_OPENJPEG
#ifdef WITH_IMAGE_OPENJPEG
SetObjIncref(Py_True);
#else
SetObjIncref(Py_False);
@@ -152,7 +152,7 @@ static PyObject *make_builtopts_info()
/* TIFF */
SetObjIncref(Py_True);
#ifdef WITH_WEBP
#ifdef WITH_IMAGE_WEBP
SetObjIncref(Py_True);
#else
SetObjIncref(Py_False);

2
source/blender/render/CMakeLists.txt
View File

@@ -82,7 +82,7 @@ if(WITH_IMAGE_OPENEXR)
list(APPEND LIB
bf_imbuf_openexr
)
add_definitions(-DWITH_OPENEXR)
add_definitions(-DWITH_IMAGE_OPENEXR)
endif()
if(WITH_FREESTYLE)