diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-03-24 14:24:30 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-03-24 14:24:54 +0300 |
| commit | 7293f6d4863a2f80fa38697f4e55ccdc0aec9e6b (patch) | |
| tree | f0ad7563c253d56457fa6ad33c81d2bcbee53a15 /source/blender/makesdna/DNA_sequence_types.h | |
| parent | 765fd7044b2bb65d844c2c705d30c858d9930da1 (diff) | |
Cleanup - move proxy storage options to the proxy itself - also will
enable more storage options, since seq->flag is running out of space
Diffstat (limited to 'source/blender/makesdna/DNA_sequence_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_sequence_types.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index c6748cca8e1..34fceaef4c0 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -95,7 +95,8 @@ typedef struct StripProxy { short build_tc_flags; // time code flags (see below) of all tc indices // to build short build_flags; - char pad[6]; + char storage; + char pad[5]; } StripProxy; typedef struct Strip { @@ -354,9 +355,9 @@ enum { SEQ_USE_TRANSFORM = (1 << 16), SEQ_USE_CROP = (1 << 17), /* SEQ_USE_COLOR_BALANCE = (1 << 18), */ /* DEPRECATED */ - SEQ_USE_PROXY_CUSTOM_DIR = (1 << 19), + /* SEQ_USE_PROXY_CUSTOM_DIR = (1 << 19), */ /* DEPRECATED */ - SEQ_USE_PROXY_CUSTOM_FILE = (1 << 21), + /* SEQ_USE_PROXY_CUSTOM_FILE = (1 << 21), */ /* DEPRECATED */ SEQ_USE_EFFECT_DEFAULT_FADE = (1 << 22), SEQ_USE_LINEAR_MODIFIERS = (1 << 23), @@ -372,6 +373,12 @@ enum { SEQ_INVALID_EFFECT = (1 << 31), }; +/* StripProxy->storage */ +enum { + SEQ_STORAGE_PROXY_CUSTOM_FILE = (1 << 1), /* store proxy in custom directory */ + SEQ_STORAGE_PROXY_CUSTOM_DIR = (1 << 2) /* store proxy in custom file */ +}; + #if (DNA_DEPRECATED_GCC_POISON == 1) #pragma GCC poison SEQ_MAKE_PREMUL #endif |