diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-06-02 05:40:53 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-06-02 05:40:53 +0400 |
| commit | 37f47ef3862a85d4d95fe5b18ab3d6b9c88ccdd3 (patch) | |
| tree | a648a61fbbc313c2833a5e4eb3c8d8d75da3c090 /source/blender/editors/space_text | |
| parent | 33267f58581ea8f9d89028958c6e64a8d048d4db (diff) | |
| parent | a117731aa23c25d699c405325c7bb7ac5680a5e7 (diff) | |
NLA SoC: Merge from 2.5 20441 to 20570 (HEAD)
There were a few conflicts/missing files. Hopefully everything updated ok...
Diffstat (limited to 'source/blender/editors/space_text')
| -rw-r--r-- | source/blender/editors/space_text/text_draw.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_text/text_ops.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c index 456060d77a7..0dfe7c9e660 100644 --- a/source/blender/editors/space_text/text_draw.c +++ b/source/blender/editors/space_text/text_draw.c @@ -119,8 +119,8 @@ static void flatten_string_append(FlattenString *fs, char c, int accum) 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); diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index 5f974e7bcbb..065b4ffcc48 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -1709,7 +1709,7 @@ static int scroll_exec(bContext *C, wmOperator *op) 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; } |