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/editors/space_sequencer/sequencer_draw.c | |
| parent | 1d930382e67e4779b3c87ccdd311a043b89ca107 (diff) | |
| parent | 00808eb39ac04c484fcabac6b18666cb2a0191e7 (diff) | |
Merge branch 'master' into gooseberry
Diffstat (limited to 'source/blender/editors/space_sequencer/sequencer_draw.c')
| -rw-r--r-- | source/blender/editors/space_sequencer/sequencer_draw.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 69ef20584d0..c9ed0b2eddd 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -516,6 +516,11 @@ static void draw_seq_text(View2D *v2d, Sequence *seq, float x1, float x2, float str_len = BLI_snprintf(str, sizeof(str), "%s: %s%s | %d", name, seq->strip->dir, seq->strip->stripdata->name, seq->len); } + else if (seq->type == SEQ_TYPE_TEXT) { + TextVars *textdata = seq->effectdata; + str_len = BLI_snprintf(str, sizeof(str), "%s | %d", + textdata->text, seq->startdisp); + } else if (seq->type & SEQ_TYPE_EFFECT) { str_len = BLI_snprintf(str, sizeof(str), "%s | %d", name, seq->len); |