diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-17 02:25:40 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-17 02:25:40 +0300 |
| commit | 9149e8942107343fb31639406124428e6ff1a029 (patch) | |
| tree | d33495dc55c5d50206437598ddcfffa24843be61 /source/blender/makesdna/DNA_image_types.h | |
| parent | ea33b90a1bf21061ab8a862d862db4dea048b28c (diff) | |
| parent | 98f43ba3e4cb0a26eb62ea98e27a313265f8948c (diff) | |
Merge branch 'master' into blende2.8
Diffstat (limited to 'source/blender/makesdna/DNA_image_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index a7ec121efda..22329661da2 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -86,11 +86,11 @@ typedef struct RenderSlot { } RenderSlot; /* iuser->flag */ -#define IMA_ANIM_ALWAYS 1 -#define IMA_ANIM_REFRESHED 2 -/* #define IMA_DO_PREMUL 4 */ -#define IMA_NEED_FRAME_RECALC 8 -#define IMA_SHOW_STEREO 16 +#define IMA_ANIM_ALWAYS (1 << 0) +#define IMA_ANIM_REFRESHED (1 << 1) +/* #define IMA_DO_PREMUL (1 << 2) */ +#define IMA_NEED_FRAME_RECALC (1 << 3) +#define IMA_SHOW_STEREO (1 << 4) enum { TEXTARGET_TEXTURE_2D = 0, @@ -178,19 +178,19 @@ enum { }; /* Image.tpageflag */ -//#define IMA_TILES 1 /* Deprecated */ -//#define IMA_TWINANIM 2 /* Deprecated */ -#define IMA_COLCYCLE 4 /* Deprecated */ -#define IMA_MIPMAP_COMPLETE 8 /* all mipmap levels in OpenGL texture set? */ -//#define IMA_CLAMP_U 16 /* Deprecated */ -//#define IMA_CLAMP_V 32 /* Deprecated */ -#define IMA_TPAGE_REFRESH 64 -#define IMA_GLBIND_IS_DATA 128 /* opengl image texture bound as non-color data */ +//#define IMA_TILES (1 << 0) /* Deprecated */ +//#define IMA_TWINANIM (1 << 1) /* Deprecated */ +#define IMA_COLCYCLE (1 << 2) /* Deprecated */ +#define IMA_MIPMAP_COMPLETE (1 << 3) /* all mipmap levels in OpenGL texture set? */ +//#define IMA_CLAMP_U (1 << 4) /* Deprecated */ +//#define IMA_CLAMP_V (1 << 5) /* Deprecated */ +#define IMA_TPAGE_REFRESH (1 << 6) +#define IMA_GLBIND_IS_DATA (1 << 7) /* opengl image texture bound as non-color data */ /* ima->type and ima->source moved to BKE_image.h, for API */ /* render */ -#define IMA_MAX_RENDER_TEXT 512 +#define IMA_MAX_RENDER_TEXT (1 << 9) /* gen_flag */ #define IMA_GEN_FLOAT 1 |