diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-11-21 06:45:35 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-21 06:45:35 +0300 |
commit | 72279e1c9247c8779f75f495ed7fa99908209411 (patch) | |
tree | 341845b0bdad0a66970c81cb6d0d1dbf72af1a92 /source/blender/makesdna/DNA_image_types.h | |
parent | 8abb58b7ce39b812ceee483b85e658d09fdeea41 (diff) |
fix for RNA ranges exceeding the range of the type (INT_MAX used on short's for eg).
Diffstat (limited to 'source/blender/makesdna/DNA_image_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_image_types.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index b58bd259983..3df3c8b41c6 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -44,17 +44,20 @@ struct GPUTexture; /* ImageUser is in Texture, in Nodes, Background Image, Image Window, .... */ /* should be used in conjunction with an ID * to Image. */ typedef struct ImageUser { + struct Scene *scene; /* to retrieve render result */ + 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 */ - short fie_ima, cycl; /* fields/image in movie, cyclic flag */ - short flag, ok; - + char fie_ima, cycl; /* fields/image in movie, cyclic flag */ + char ok, pad; + short multi_index, layer, pass; /* listbase indices, for menu browsing or retrieve buffer */ - /* short menunr; */ /* localized menu entry, for handling browse event */ - short pad; - struct Scene *scene; /* to retrieve render result */ + short flag; + + int pad2; + } ImageUser; /* iuser->flag */ |