diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-09-19 00:01:31 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-09-19 00:01:31 +0300 |
| commit | 6e19aa42bf7aa5ef7dbc9a6a37de0f4a04b6a72d (patch) | |
| tree | 282d6a2d3261e3db13335292d257fa55a4606672 /source/blender/blenkernel/intern/seqeffects.c | |
| parent | de7b7572c258c811ad0165f199d59dcef3bafad3 (diff) | |
Fix T46155: Sequencer Text Effect: wrong vertical 'TOP' alignment.
Logic was broken for this vertical alignment option - we need to remove one line height here...
Diffstat (limited to 'source/blender/blenkernel/intern/seqeffects.c')
| -rw-r--r-- | source/blender/blenkernel/intern/seqeffects.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index fac88e2aa24..f375c2b1e4f 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -2960,7 +2960,7 @@ static ImBuf *do_text_effect(const SeqRenderData *context, Sequence *seq, float if ((data->align == SEQ_TEXT_ALIGN_X_LEFT) && (data->align_y == SEQ_TEXT_ALIGN_Y_TOP)) { - /* pass */ + y -= line_height; } else { /* vars for calculating wordwrap */ @@ -2978,7 +2978,10 @@ static ImBuf *do_text_effect(const SeqRenderData *context, Sequence *seq, float x -= BLI_rctf_size_x(&wrap.rect) / 2; } - if (data->align_y == SEQ_TEXT_ALIGN_Y_BOTTOM) { + if (data->align_y == SEQ_TEXT_ALIGN_Y_TOP) { + y -= line_height; + } + else if (data->align_y == SEQ_TEXT_ALIGN_Y_BOTTOM) { y += (wrap.info.lines - 1) * line_height; } else if (data->align_y == SEQ_TEXT_ALIGN_Y_CENTER) { |