griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T54593: Py text edits crash (undo regression)

Browse Source
This commit is contained in:
Campbell Barton
2018-04-15 10:34:41 +02:00
parent 87a9b6ac06
commit fb3528d088
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/blenkernel/intern/text.c
View File

@@ -526,29 +526,26 @@ void BKE_text_make_local(Main *bmain, Text *text, const bool lib_local)
void BKE_text_clear(Text *text, TextUndoBuf *utxt) /* called directly from rna */
{
int oldstate;
if (utxt) {
oldstate = txt_get_undostate();
}
txt_set_undostate(utxt != NULL);
const bool undostate_orig = txt_get_undostate();
txt_set_undostate(utxt == NULL);
txt_sel_all(text);
txt_delete_sel(text, utxt);
txt_set_undostate(oldstate);
txt_set_undostate(undostate_orig);
txt_make_dirty(text);
}
void BKE_text_write(Text *text, TextUndoBuf *utxt, const char *str) /* called directly from rna */
{
int oldstate;
const bool undostate_orig = txt_get_undostate();
txt_set_undostate(utxt == NULL);
oldstate = txt_get_undostate();
txt_insert_buf(text, utxt, str);
txt_move_eof(text, 0);
txt_set_undostate(oldstate);
txt_set_undostate(undostate_orig);
txt_make_dirty(text);
}