[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52404] trunk/blender/source/blender/ editors/space_text/text_draw.c: Text editor: fix for line spacing with word wrap enabled

[Sergey Sharybin]

Revision: 52404
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52404
Author:   nazgul
Date:     2012-11-20 12:10:54 +0000 (Tue, 20 Nov 2012)
Log Message:
-----------
Text editor: fix for line spacing with word wrap enabled

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_text/text_draw.c

Modified: trunk/blender/source/blender/editors/space_text/text_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_draw.c	2012-11-20 11:44:55 UTC (rev 52403)
+++ trunk/blender/source/blender/editors/space_text/text_draw.c	2012-11-20 12:10:54 UTC (rev 52404)
@@ -734,7 +734,7 @@
 				if (st->showsyntax && format) format_draw_color(format[a]);
 				x += text_font_draw_character_utf8(st, x, y, str + ma);
 			}
-			y -= st->lheight;
+			y -= st->lheight + TXT_LINE_SPACING;
 			x = basex;
 			lines++;
 			start = end; mstart = mend;
@@ -1834,16 +1834,14 @@
 		if (st->wordwrap) {
 			/* draw word wrapped text */
 			int lines = text_draw_wrapped(st, tmp->line, x, y, winx - x, tmp->format, wrap_skip);
-			y -= lines * st->lheight;
+			y -= lines * (st->lheight + TXT_LINE_SPACING);
 		}
 		else {
 			/* draw unwrapped text */
 			text_draw(st, tmp->line, st->left, ar->winx / st->cwidth, 1, x, y, tmp->format);
-			y -= st->lheight;
+			y -= st->lheight + TXT_LINE_SPACING;
 		}
 		
-		y-= TXT_LINE_SPACING;
-
 		wrap_skip = 0;
 	}