diff options
Diffstat (limited to 'source/blender/imbuf/IMB_imbuf_types.h')
| -rw-r--r-- | source/blender/imbuf/IMB_imbuf_types.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h index 28e62d496b2..49e2e7fc80d 100644 --- a/source/blender/imbuf/IMB_imbuf_types.h +++ b/source/blender/imbuf/IMB_imbuf_types.h @@ -167,14 +167,15 @@ typedef struct ImBuf { #define IB_animdeinterlace (1 << 9) #define IB_tiles (1 << 10) #define IB_tilecache (1 << 11) -#define IB_premul (1 << 12) -#define IB_cm_predivide (1 << 13) +#define IB_alphamode_premul (1 << 12) /* indicates whether image on disk have premul alpha */ +#define IB_alphamode_detect (1 << 13) /* if this flag is set, alpha mode would be guessed from file */ +#define IB_ignore_alpha (1 << 14) /* ignore alpha on load and substitude it with 1.0f */ /* * The bit flag is stored in the ImBuf.ftype variable. - * Note that the lower 10 bits is used for storing custom flags + * Note that the lower 11 bits is used for storing custom flags */ -#define IB_CUSTOM_FLAGS_MASK 0x3ff +#define IB_CUSTOM_FLAGS_MASK 0x400 #define PNG (1 << 30) #define TGA (1 << 28) @@ -217,8 +218,12 @@ typedef struct ImBuf { #define JP2_YCC (1 << 15) #define JP2_CINE (1 << 14) #define JP2_CINE_48FPS (1 << 13) +#define JP2_JP2 (1 << 12) +#define JP2_J2K (1 << 11) #endif +#define PNG_16BIT (1 << 10) + #define RAWTGA (TGA | 1) #define JPG_STD (JPG | (0 << 8)) |