diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-26 14:38:32 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-02-26 14:38:32 +0300 |
| commit | 931ac1cebdc9b24bbe523a02d09babf1f3e1d1c3 (patch) | |
| tree | c3d9b248084c3c575c34b1cd30345c7dfb19a0ff /source/blender/makesdna/DNA_image_types.h | |
| parent | e9ce2a9f3f7e93692a6dc1c25ed050391f510436 (diff) | |
Bugfix: recent rollback of premul changes gave issues. The premul
flag bit was changed and not changed back, and the flag was moved
back from image user to image. This meant that files saved both
before and during the premul changes did not read premul settings
correct anymore.
Now it uses the old premul flag bit again, which also keeps forward
compatibility.
Diffstat (limited to 'source/blender/makesdna/DNA_image_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index d5e4b7a1142..ef79f2e941f 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -58,6 +58,7 @@ typedef struct ImageUser { /* iuser->flag */ #define IMA_ANIM_ALWAYS 1 #define IMA_ANIM_REFRESHED 2 +/* #define IMA_DO_PREMUL 4 */ typedef struct Image { ID id; @@ -104,11 +105,12 @@ typedef struct 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_ANTIALI 64 -#define IMA_DO_PREMUL 128 +#define IMA_OLD_PREMUL 128 /* tpageflag */ #define IMA_TILES 1 |