diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-06 14:25:59 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-06 14:25:59 +0400 |
| commit | 870ba8aa13c87fdeb1724d0f3ad7b7a4b53a4d32 (patch) | |
| tree | b20f227ec19530eab04c9a54e8cf7faaf16f634d /source/blender/makesdna/DNA_movieclip_types.h | |
| parent | 2202aaa083b99a4c37c20fbaf34e370d4e78c839 (diff) | |
| parent | 8849a789702a9be0c06ecc850845c3bb3af0d0fd (diff) | |
svn merge ^/trunk/blender -r47423:47506
Diffstat (limited to 'source/blender/makesdna/DNA_movieclip_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_movieclip_types.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h index f073a1957dc..81d532fd247 100644 --- a/source/blender/makesdna/DNA_movieclip_types.h +++ b/source/blender/makesdna/DNA_movieclip_types.h @@ -85,6 +85,8 @@ typedef struct MovieClip { int flag; int len; /* length of movie */ + + int start_frame, pad; } MovieClip; typedef struct MovieClipScopes { @@ -121,6 +123,7 @@ typedef struct MovieClipScopes { /* MovieClip->flag */ #define MCLIP_USE_PROXY (1<<0) #define MCLIP_USE_PROXY_CUSTOM_DIR (1<<1) +#define MCLIP_CUSTOM_START_FRAME (1<<2) #define MCLIP_TIMECODE_FLAGS (MCLIP_USE_PROXY|MCLIP_USE_PROXY_CUSTOM_DIR) |