diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-15 11:05:03 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-15 11:05:03 +0300 |
| commit | fcff9843384ff72a9549cfb301bdbd418aa12d1b (patch) | |
| tree | 0bf3ce1a7544072710230e219c16fd3a471c4b22 /source/blender/makesdna | |
| parent | 9632ca0a13b415a83572378862a44047e0a362e0 (diff) | |
| parent | 7fec7eee2070aac701f7918311a05ca2bfd1b3b0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_movieclip_types.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h index 499f1c50155..56b99475909 100644 --- a/source/blender/makesdna/DNA_movieclip_types.h +++ b/source/blender/makesdna/DNA_movieclip_types.h @@ -146,6 +146,7 @@ enum { MCLIP_USE_PROXY = (1 << 0), MCLIP_USE_PROXY_CUSTOM_DIR = (1 << 1), /* MCLIP_CUSTOM_START_FRAME = (1<<2), */ /* UNUSED */ + MCLIP_DATA_EXPAND = (1 << 3), MCLIP_TIMECODE_FLAGS = (MCLIP_USE_PROXY | MCLIP_USE_PROXY_CUSTOM_DIR) }; |