[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33758] trunk/blender/source/blender/ editors/space_text/text_ops.c: Partial revert of mine previous commit and correct fix

Sergey Sharybin g.ulairi at gmail.com
Fri Dec 17 21:54:21 CET 2010


Revision: 33758
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33758
Author:   nazgul
Date:     2010-12-17 21:54:21 +0100 (Fri, 17 Dec 2010)

Log Message:
-----------
Partial revert of mine previous commit and correct fix

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

Modified: trunk/blender/source/blender/editors/space_text/text_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_ops.c	2010-12-17 20:24:13 UTC (rev 33757)
+++ trunk/blender/source/blender/editors/space_text/text_ops.c	2010-12-17 20:54:21 UTC (rev 33758)
@@ -1589,11 +1589,10 @@
 
 	max= wrap_width(st, ar);
 
-	start= chars= 0;
+	start= chars= endj= 0;
 	end= max;
 	chop= loop= 1;
 	*charp= 0;
-	endj= max-1;
 
 	for(i=0, j=0; loop; j++) {
 		/* Mimic replacement of tabs */
@@ -1606,6 +1605,8 @@
 
 		while(chars--) {
 			if(i-start>=max) {
+				if(chop) endj= j-1;
+
 				if(endj>=oldc) {
 					if(ch=='\0') *charp= (*linep)->len;
 					else *charp= endj;
@@ -1613,8 +1614,6 @@
 					break;
 				}
 
-				if(chop) endj= j-1;
-
 				start= end;
 				end += max;
 				chop= 1;





More information about the Bf-blender-cvs mailing list