diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-06 23:11:06 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-06-06 23:11:06 +0400 |
commit | 286c5915b35f3008030cd89899be0d714bd30ada (patch) | |
tree | 8ae11c6876a26ec92bc7262e6fd5ab55ce5cd100 /source/blender/makesdna/DNA_movieclip_types.h | |
parent | 870ba8aa13c87fdeb1724d0f3ad7b7a4b53a4d32 (diff) | |
parent | f43a733f591377f2cdce0555443dba003c05fd30 (diff) |
Merging r47507 through r47534 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/makesdna/DNA_movieclip_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_movieclip_types.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h index 81d532fd247..fd7046854ff 100644 --- a/source/blender/makesdna/DNA_movieclip_types.h +++ b/source/blender/makesdna/DNA_movieclip_types.h @@ -123,7 +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_CUSTOM_START_FRAME (1<<2)*/ /* UNUSED */ #define MCLIP_TIMECODE_FLAGS (MCLIP_USE_PROXY|MCLIP_USE_PROXY_CUSTOM_DIR) |