Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Eagar <joeedh@gmail.com>2008-02-23 01:23:58 +0300
committerJoseph Eagar <joeedh@gmail.com>2008-02-23 01:23:58 +0300
commit0e233b3213a21449399d91b9ee841c235fbba4d7 (patch)
treeda61feed9bf0d7274c7725f909e170a39d0e1561 /source/blender/makesdna/DNA_image_types.h
parent28fb57804835e41f51da9bfdecda6b49ede439f2 (diff)
=Reversion of premul bugfix=
Reversion of premul bugfix, as it was apparently not working all that well. Note that this brings back the bug where the erase alpha paint tool won't display correctly, since the UV image editor just draws images in key alpha now.
Diffstat (limited to 'source/blender/makesdna/DNA_image_types.h')
-rw-r--r--source/blender/makesdna/DNA_image_types.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h
index bc94f807baa..d5e4b7a1142 100644
--- a/source/blender/makesdna/DNA_image_types.h
+++ b/source/blender/makesdna/DNA_image_types.h
@@ -58,7 +58,6 @@ 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;
@@ -109,12 +108,7 @@ typedef struct Image {
#define IMA_REFLECT 16
#define IMA_NOCOLLECT 32
#define IMA_ANTIALI 64
-
-/*used to be IMA_DO_PREMUL. Note that
- in theory, in should be possible
- to use this flag position if necassary,
- since this is only used in do_versions.*/
-#define IMA_OLDFLAG 128
+#define IMA_DO_PREMUL 128
/* tpageflag */
#define IMA_TILES 1