[Bf-blender-cvs] [baccf32] input_method_editor: Merge branch 'master' of git.blender.org:blender into input_method_editor

[Severin]

Commit: baccf320767144d97253e0d9c8e39e58c4802978
Author: Severin
Date:   Tue Nov 18 23:12:09 2014 +0100
Branches: input_method_editor
https://developer.blender.org/rBbaccf320767144d97253e0d9c8e39e58c4802978

Merge branch 'master' of git.blender.org:blender into input_method_editor

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



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

diff --cc source/blender/editors/space_info/textview.c
index dbca3fa,ebce133..7589464
--- a/source/blender/editors/space_info/textview.c
+++ b/source/blender/editors/space_info/textview.c
@@@ -194,10 -153,9 +194,10 @@@ static int console_draw_string(ConsoleD
  
  		cdc->xy[1] = y_next;
  		MEM_freeN(offsets);
 +		if (buf) MEM_freeN(buf);
  		return 1;
  	}
- 	else if (y_next - cdc->lheight < cdc->ymin) {
+ 	else if (y_next < cdc->ymin) {
  		/* have not reached the drawable area so don't break */
  		cdc->xy[1] = y_next;