diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-29 20:13:06 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-29 20:13:06 +0300 |
| commit | 84d39ab97bba5d4885a062363c8b3f3d28cb7da7 (patch) | |
| tree | ddb66f67c6ea1ceafd4aefb07e96f06c26505550 /source/blender/blenkernel/intern/sequencer.c | |
| parent | baaf81e13edc2b25dee7af67f49e7a731d057513 (diff) | |
| parent | e4b54f44c1b19069de5818d47ce899c690e9b56d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
| -rw-r--r-- | source/blender/blenkernel/intern/sequencer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index f925259e206..2319d36ab16 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -1164,6 +1164,7 @@ static const char *give_seqname_by_type(int type) case SEQ_TYPE_ALPHAOVER: return "Alpha Over"; case SEQ_TYPE_ALPHAUNDER: return "Alpha Under"; case SEQ_TYPE_OVERDROP: return "Over Drop"; + case SEQ_TYPE_COLORMIX: return "Color Mix"; case SEQ_TYPE_WIPE: return "Wipe"; case SEQ_TYPE_GLOW: return "Glow"; case SEQ_TYPE_TRANSFORM: return "Transform"; |