diff options
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 16 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 3 |
2 files changed, 10 insertions, 9 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index fc8807d0f7c..a1b0ab06ecd 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -112,14 +112,14 @@ typedef struct Image { /* **************** IMAGE ********************* */ /* Image.flag */ -#define IMA_FIELDS 1 -#define IMA_STD_FIELD 2 -#define IMA_DO_PREMUL 4 - -#define IMA_REFLECT 16 -#define IMA_NOCOLLECT 32 -#define IMA_DEPRECATED 64 -#define IMA_OLD_PREMUL 128 +#define IMA_FIELDS 1 +#define IMA_STD_FIELD 2 +#define IMA_DO_PREMUL 4 +#define IMA_REFLECT 16 +#define IMA_NOCOLLECT 32 +#define IMA_DEPRECATED 64 +#define IMA_OLD_PREMUL 128 +#define IMA_CM_PREDIVIDE 256 /* Image.tpageflag */ #define IMA_TILES 1 diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index d1ab12433fb..9b49bc53ef3 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1100,7 +1100,8 @@ typedef struct Scene { #define R_ALPHAKEY 2 /* color_mgt_flag */ -#define R_COLOR_MANAGEMENT 1 +#define R_COLOR_MANAGEMENT (1 << 0) +#define R_COLOR_MANAGEMENT_PREDIVIDE (1 << 1) /* subimtype, flag options for imtype */ #define R_OPENEXR_HALF 1 /*deprecated*/ |