Revision: 20484
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20484
Author:   blendix
Date:     2009-05-29 01:48:29 +0200 (Fri, 29 May 2009)

Log Message:
-----------
2.5: fix text editor issue with scrolling and an invalid memory read.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_text/text_draw.c
    branches/blender2.5/blender/source/blender/editors/space_text/text_ops.c

Modified: 
branches/blender2.5/blender/source/blender/editors/space_text/text_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_text/text_draw.c   
2009-05-28 23:45:50 UTC (rev 20483)
+++ branches/blender2.5/blender/source/blender/editors/space_text/text_draw.c   
2009-05-28 23:48:29 UTC (rev 20484)
@@ -119,8 +119,8 @@
                if(olen) fs->len*= 2;
                else fs->len= 256;
                
-               nbuf= MEM_mallocN(sizeof(*fs->buf)*fs->len, "fs->buf");
-               naccum= MEM_mallocN(sizeof(*fs->accum)*fs->len, "fs->accum");
+               nbuf= MEM_callocN(sizeof(*fs->buf)*fs->len, "fs->buf");
+               naccum= MEM_callocN(sizeof(*fs->accum)*fs->len, "fs->accum");
                
                if(olen) {
                        memcpy(nbuf, fs->buf, olen);

Modified: 
branches/blender2.5/blender/source/blender/editors/space_text/text_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_text/text_ops.c    
2009-05-28 23:45:50 UTC (rev 20483)
+++ branches/blender2.5/blender/source/blender/editors/space_text/text_ops.c    
2009-05-28 23:48:29 UTC (rev 20484)
@@ -1709,7 +1709,7 @@
 
        screen_skip(st, lines*U.wheellinescroll);
 
-       WM_event_add_notifier(C, NC_TEXT|NA_EDITED, st->text);
+       ED_area_tag_redraw(CTX_wm_area(C));
 
        return OPERATOR_FINISHED;
 }


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to