diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2018-04-17 16:53:36 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2018-04-17 18:51:28 +0300 |
| commit | fb24813d64dd8fa2ddb8c0e55004d3792281c8d7 (patch) | |
| tree | b81ccdad39051eceb9c99c172f876c813d9a464e /source/blender/makesdna/DNA_image_types.h | |
| parent | 159806140fd33e6ddab951c0f6f180cfbf927d38 (diff) | |
Remove game properties in image editor
The following properties were used by the Blender Game Engine and no longer
need to be around:
* Animated
* Tiles
* Clamp
* Mapping
Diffstat (limited to 'source/blender/makesdna/DNA_image_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index b4bc26f45cd..3d29c5b3833 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -116,23 +116,18 @@ typedef struct Image { int lastframe; /* texture page */ - short tpageflag, totbind; - short xrep, yrep; - short twsta, twend; + short tpageflag; + short pad2; unsigned int bindcode[2]; /* only for current image... 2 = TEXTARGET_COUNT */ - char pad1[4]; - unsigned int *repbind; /* for repeat of parts of images */ - + 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; @@ -168,7 +163,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 +179,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 */ |