diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-10 18:28:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-10 18:31:13 +0300 |
| commit | 2574ee3d3878c8a78fb2ff1955b10ed20f0ad892 (patch) | |
| tree | b9bb382b855df1777bbad092692fe2450b47bcfa /source/blender/makesdna | |
| parent | c10ece49baea0458f44668d8ad92764c2c361c90 (diff) | |
Image: remove fields option for image sequences
Remove support for loading interlaced image sequences because
its less common now to record interlaced video,
the option to de-interlace video on load remains.
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 6 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_texture_types.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index 26d7f089f8b..a7ec121efda 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -51,7 +51,7 @@ typedef struct ImageUser { int framenr; /* movies, sequences: current to display */ int frames; /* total amount of frames to use */ int offset, sfra; /* offset within movie, start frame in global time */ - char fie_ima, cycl; /* fields/image in movie, cyclic flag */ + char _pad, cycl; /* cyclic flag */ char ok; char multiview_eye; /* multiview current eye - for internal use of drawing routines */ @@ -157,8 +157,8 @@ typedef struct Image { /* Image.flag */ enum { - IMA_FIELDS = (1 << 0), - IMA_STD_FIELD = (1 << 1), + // IMA_FIELDS = (1 << 0), + // IMA_STD_FIELD = (1 << 1), #ifdef DNA_DEPRECATED IMA_DO_PREMUL = (1 << 2), /* deprecated, should not be used */ #endif diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h index ca420195b99..42198e22c6b 100644 --- a/source/blender/makesdna/DNA_texture_types.h +++ b/source/blender/makesdna/DNA_texture_types.h @@ -192,7 +192,7 @@ typedef struct Tex { short extend; /* variables disabled, moved to struct iuser */ - short fie_ima; + short _pad0; int len; int frames, offset, sfra; @@ -319,7 +319,7 @@ typedef struct ColorMapping { /* imaflag unused, only for version check */ #ifdef DNA_DEPRECATED_ALLOW -#define TEX_FIELDS_ 8 +// #define TEX_FIELDS_ 8 #define TEX_ANIMCYCLIC_ 64 #define TEX_ANIM5_ 128 #define TEX_ANTIALI_ 256 |