diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-07-02 20:30:50 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-07-02 20:30:50 +0300 |
| commit | 5709b9951eed094f6bcfb00ba22b4807dd81873b (patch) | |
| tree | 4a15613b3ff953e572c5a1624cf6e19f0a921fd6 /source/blender/makesdna/DNA_sequence_types.h | |
| parent | 1d930382e67e4779b3c87ccdd311a043b89ca107 (diff) | |
| parent | 00808eb39ac04c484fcabac6b18666cb2a0191e7 (diff) | |
Merge branch 'master' into gooseberry
Diffstat (limited to 'source/blender/makesdna/DNA_sequence_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_sequence_types.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index 7b342d30ca1..dfb9aa0c417 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -277,6 +277,17 @@ typedef struct GaussianBlurVars { float size_y; } GaussianBlurVars; +typedef struct TextVars { + char text[512]; + int text_size; + int xpos, ypos; + int flags; +} TextVars; + +enum { + TEXT_SEQ_SHADOW = (1 << 0), + TEXT_SEQ_AUTO_CENTER = (1 << 1), +}; /* ***************** Sequence modifiers ****************** */ typedef struct SequenceModifierData { @@ -471,7 +482,9 @@ enum { SEQ_TYPE_MULTICAM = 30, SEQ_TYPE_ADJUSTMENT = 31, SEQ_TYPE_GAUSSIAN_BLUR = 40, - SEQ_TYPE_MAX = 40 + SEQ_TYPE_TEXT = 41, + + SEQ_TYPE_MAX = 41 }; #define SEQ_MOVIECLIP_RENDER_UNDISTORTED (1 << 0) |