[Bf-blender-cvs] [6e19aa4] master: Fix T46155: Sequencer Text Effect: wrong vertical 'TOP' alignment.

[Bastien Montagne]

Commit: 6e19aa42bf7aa5ef7dbc9a6a37de0f4a04b6a72d
Author: Bastien Montagne
Date:   Fri Sep 18 23:01:31 2015 +0200
Branches: master
https://developer.blender.org/rB6e19aa42bf7aa5ef7dbc9a6a37de0f4a04b6a72d

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...

===================================================================

M	source/blender/blenkernel/intern/seqeffects.c

===================================================================

diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index fac88e2..f375c2b 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) {