diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-10-13 16:44:58 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-10-13 16:44:58 +0300 |
commit | 168604ecbe60ba909e3057cadf1c4047ea966d0c (patch) | |
tree | a4699c125b9ace4e1d4efaff747a3ac0faed78c3 /source/blender/blenkernel/intern/text.c | |
parent | 9d5cdf92b28217e29b6840eae8d0c44f033e3cf6 (diff) |
Revert to master - those changes are globally valid, but remain incomplete,free-refcount-ids
and total new code is being done in id-remap anyway, not worth bothering with this for now...
Diffstat (limited to 'source/blender/blenkernel/intern/text.c')
-rw-r--r-- | source/blender/blenkernel/intern/text.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index d5d2e169aa3..77d6043d6f3 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -152,19 +152,10 @@ static void init_undo_text(Text *text) text->undo_buf = MEM_mallocN(text->undo_len, "undo buf"); } -/** - * Free (or release) any data used by this text (does not free the text itself). - * - * \param text The text to free. - * \param do_id_user When \a true, ID datablocks used (referenced) by this text are 'released' - * (their user count is decreased). - */ -void BKE_text_free(Text *text, const bool UNUSED(do_id_user)) +void BKE_text_free(Text *text) { TextLine *tmp; - /* No animdata here. */ - for (tmp = text->lines.first; tmp; tmp = tmp->next) { MEM_freeN(tmp->line); if (tmp->format) @@ -173,10 +164,10 @@ void BKE_text_free(Text *text, const bool UNUSED(do_id_user)) BLI_freelistN(&text->lines); - MEM_SAFE_FREE(text->name); - MEM_SAFE_FREE(text->undo_buf); + if (text->name) MEM_freeN(text->name); + MEM_freeN(text->undo_buf); #ifdef WITH_PYTHON - BPY_text_free_code(text); + if (text->compiled) BPY_text_free_code(text); #endif } |