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_image | |
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_image')
-rw-r--r-- | source/blender/editors/space_image/image_undo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_image/image_undo.c b/source/blender/editors/space_image/image_undo.c index 8c5e2ee2f8a..6cbebd2a959 100644 --- a/source/blender/editors/space_image/image_undo.c +++ b/source/blender/editors/space_image/image_undo.c @@ -883,9 +883,7 @@ static bool image_undosys_step_encode(struct bContext *C, } } else { - if (C == NULL) { - return false; - } + BLI_assert(C != NULL); /* Happens when switching modes. */ ePaintMode paint_mode = BKE_paintmode_get_active_from_context(C); BLI_assert(ELEM(paint_mode, PAINT_MODE_TEXTURE_2D, PAINT_MODE_TEXTURE_3D)); @@ -998,6 +996,8 @@ void ED_image_undosys_type(UndoType *ut) ut->step_foreach_ID_ref = image_undosys_foreach_ID_ref; + /* NOTE this is actually a confusing case, since it expects a valid context, but only in a + * specific case, see `image_undosys_step_encode` code. */ ut->use_context_for_encode = false; ut->step_size = sizeof(ImageUndoStep); |