diff options
author | Bastien Montagne <bastien@blender.org> | 2021-01-06 17:50:12 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2021-01-06 17:59:23 +0300 |
commit | a584aef4703aeefe0843f3b8aa2c1e863f825aef (patch) | |
tree | 818860977367409c3381021915345044dfacb5cb /source/blender/editors/space_text | |
parent | 691c021679f6a2038536fcec0bdd7de654c79853 (diff) |
Undo: Further tweak/fixes the 'use context' flag of undo types.
Note that this is fairly fragile still, especially in cases like paint
cureve undo, which actually does not use context in most cases (and can
be called with a NULL context), but do need it in one case. This will
need a proper rework at some point.
Diffstat (limited to 'source/blender/editors/space_text')
-rw-r--r-- | source/blender/editors/space_text/text_undo.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/editors/space_text/text_undo.c b/source/blender/editors/space_text/text_undo.c index c6bcbc06b2f..8bc22833502 100644 --- a/source/blender/editors/space_text/text_undo.c +++ b/source/blender/editors/space_text/text_undo.c @@ -183,14 +183,11 @@ static bool text_undosys_step_encode(struct bContext *C, struct Main *UNUSED(bmain), UndoStep *us_p) { - if (C == NULL) { - return false; - } - TextUndoStep *us = (TextUndoStep *)us_p; Text *text = us->text_ref.ptr; BLI_assert(text == CTX_data_edit_text(C)); + UNUSED_VARS_NDEBUG(C); us->step.data_size += text_undosys_step_encode_to_state(&us->states[1], text); @@ -263,7 +260,7 @@ void ED_text_undosys_type(UndoType *ut) ut->step_foreach_ID_ref = text_undosys_foreach_ID_ref; - ut->use_context_for_encode = false; + ut->use_context_for_encode = true; ut->step_size = sizeof(TextUndoStep); } |