diff options
author | Jacques Lucke <jacques@blender.org> | 2021-11-02 13:17:53 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2021-11-02 13:17:53 +0300 |
commit | ffd3dd63769c8e97eceda54c8fa4067d872655be (patch) | |
tree | d447747a3e1d995715c09c2ea3e1d0b8c813e731 /source/blender/makesdna/DNA_image_types.h | |
parent | a2f5a101292add7fa296ae7b5245e8b0bf2495f4 (diff) | |
parent | 0c3b215e7d5456878b155d13440864f49ad1f230 (diff) |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/makesdna/DNA_image_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index 319e1aa75f6..64c8fd3e3a9 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -51,16 +51,13 @@ typedef struct ImageUser { /** Offset within movie, start frame in global time. */ int offset, sfra; /** Cyclic flag. */ - char _pad0, cycl; - char ok; + char cycl; /** Multiview current eye - for internal use of drawing routines. */ char multiview_eye; short pass; - char _pad1[2]; int tile; - int _pad2; /** Listbase indices, for menu browsing or retrieve buffer. */ short multi_index, view, layer; @@ -112,9 +109,7 @@ typedef struct ImageTile { struct ImageTile_Runtime runtime; - char ok; - char _pad[3]; - + char _pad[4]; int tile_number; char label[64]; } ImageTile; |