From 0c7458604d06d2ff9f37bfe8d05c6a0cc23a9a18 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 3 Oct 2022 19:56:51 +0200 Subject: Cleanup: rename IMA_CHAN_FLAG_ALPHA to IMA_CHAN_FLAG_RGBA to match meaning --- source/blender/blenkernel/BKE_image_format.h | 2 +- source/blender/blenkernel/intern/image_format.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/BKE_image_format.h b/source/blender/blenkernel/BKE_image_format.h index 8f71e1f4648..e3254c59ca4 100644 --- a/source/blender/blenkernel/BKE_image_format.h +++ b/source/blender/blenkernel/BKE_image_format.h @@ -52,7 +52,7 @@ int BKE_image_path_ensure_ext_from_imtype(char *string, char imtype); #define IMA_CHAN_FLAG_BW 1 #define IMA_CHAN_FLAG_RGB 2 -#define IMA_CHAN_FLAG_ALPHA 4 +#define IMA_CHAN_FLAG_RGBA 4 char BKE_ftype_to_imtype(int ftype, const struct ImbFormatOptions *options); int BKE_imtype_to_ftype(char imtype, struct ImbFormatOptions *r_options); diff --git a/source/blender/blenkernel/intern/image_format.cc b/source/blender/blenkernel/intern/image_format.cc index 57763e1670f..8bff6c376b3 100644 --- a/source/blender/blenkernel/intern/image_format.cc +++ b/source/blender/blenkernel/intern/image_format.cc @@ -272,7 +272,7 @@ char BKE_imtype_valid_channels(const char imtype, bool write_file) case R_IMF_IMTYPE_JP2: case R_IMF_IMTYPE_DPX: case R_IMF_IMTYPE_WEBP: - chan_flag |= IMA_CHAN_FLAG_ALPHA; + chan_flag |= IMA_CHAN_FLAG_RGBA; break; } -- cgit v1.2.3