diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-18 15:26:11 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-02-18 15:26:11 +0400 |
| commit | 910f04ca6373510f463de2541576b479671dc2ef (patch) | |
| tree | 544499dbbab4c371052e54cc1a32e7a60e64206a /source/blender/makesdna/DNA_movieclip_types.h | |
| parent | f261d58b6dfd68ae936ed8b76c8399df7a34a071 (diff) | |
| parent | f3bef40b0cf2a10bcffedae6c5235e3f5537670f (diff) | |
Merged changes in the trunk up to revision 44221.
Conflicts resolved:
release/datafiles/blender_icons.png
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/makesdna/DNA_movieclip_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_movieclip_types.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h index e5c706d2a3a..be189e883c7 100644 --- a/source/blender/makesdna/DNA_movieclip_types.h +++ b/source/blender/makesdna/DNA_movieclip_types.h @@ -32,13 +32,14 @@ * \author Sergey Sharybin */ -#ifndef DNA_MOVIECLIP_TYPES_H -#define DNA_MOVIECLIP_TYPES_H +#ifndef __DNA_MOVIECLIP_TYPES_H__ +#define __DNA_MOVIECLIP_TYPES_H__ #include "DNA_ID.h" #include "DNA_tracking_types.h" struct anim; +struct AnimData; struct bGPdata; struct ImBuf; struct MovieClipProxy; @@ -51,7 +52,7 @@ typedef struct MovieClipUser { } MovieClipUser; typedef struct MovieClipProxy { - char dir[768]; /* custom directory for index and proxy files (defaults to BL_proxy) */ + char dir[768]; /* 768=FILE_MAXDIR custom directory for index and proxy files (defaults to BL_proxy) */ short tc; /* time code in use */ short quality; /* proxy build quality */ @@ -61,6 +62,7 @@ typedef struct MovieClipProxy { typedef struct MovieClip { ID id; + struct AnimData *adt; /* animation data (must be immediately after id for utilities to use it) */ char name[1024]; /* file path, 1024 = FILE_MAX */ |