diff options
Diffstat (limited to 'source/blender/makesdna/DNA_image_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index 760e9b5461e..26d7f089f8b 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -80,7 +80,9 @@ typedef struct ImagePackedFile { } ImagePackedFile; typedef struct RenderSlot { + struct RenderSlot *next, *prev; char name[64]; /* 64 = MAX_NAME */ + struct RenderResult *render; } RenderSlot; /* iuser->flag */ @@ -108,7 +110,7 @@ typedef struct Image { ListBase anims; struct RenderResult *rr; - struct RenderResult *renders[8]; /* IMA_MAX_RENDER_SLOT */ + ListBase renderslots; short render_slot, last_render_slot; int flag; @@ -116,23 +118,17 @@ typedef struct Image { int lastframe; /* texture page */ - short tpageflag, totbind; - short xrep, yrep; - short twsta, twend; - unsigned int bindcode[2]; /* only for current image... 2 = TEXTARGET_COUNT */ - char pad1[4]; - unsigned int *repbind; /* for repeat of parts of images */ + short tpageflag; + short pad2; + unsigned int pad3; struct PackedFile *packedfile DNA_DEPRECATED; /* deprecated */ struct ListBase packedfiles; struct PreviewImage *preview; - /* game engine tile animation */ - float lastupdate; int lastused; - short animspeed; - short ok; + short pad4[3]; /* for generated images */ int gen_x, gen_y; @@ -154,8 +150,6 @@ typedef struct Image { char views_format; ListBase views; /* ImageView */ struct Stereo3dFormat *stereo3d_format; - - RenderSlot render_slots[8]; /* 8 = IMA_MAX_RENDER_SLOT */ } Image; @@ -168,7 +162,7 @@ enum { #ifdef DNA_DEPRECATED IMA_DO_PREMUL = (1 << 2), /* deprecated, should not be used */ #endif - IMA_REFLECT = (1 << 4), + //IMA_REFLECT = (1 << 4), /* deprecated */ IMA_NOCOLLECT = (1 << 5), //IMA_DONE_TAG = (1 << 6), // UNUSED IMA_OLD_PREMUL = (1 << 7), @@ -184,12 +178,12 @@ enum { }; /* Image.tpageflag */ -#define IMA_TILES 1 -#define IMA_TWINANIM 2 -#define IMA_COLCYCLE 4 /* Depreciated */ +//#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 -#define IMA_CLAMP_V 32 +//#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 */ @@ -197,7 +191,6 @@ enum { /* render */ #define IMA_MAX_RENDER_TEXT 512 -#define IMA_MAX_RENDER_SLOT 8 /* gen_flag */ #define IMA_GEN_FLOAT 1 |