From e301f3422d9922598e0cabf12a4e22eda0ae0880 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 25 Feb 2021 15:43:30 +1100 Subject: Fix T85974: Edit-mode undo/redo causes assertion Assert the poll function succeeds after setting the active object. --- source/blender/editors/armature/editarmature_undo.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/armature') diff --git a/source/blender/editors/armature/editarmature_undo.c b/source/blender/editors/armature/editarmature_undo.c index 337d1138b23..cbca171d3af 100644 --- a/source/blender/editors/armature/editarmature_undo.c +++ b/source/blender/editors/armature/editarmature_undo.c @@ -37,6 +37,7 @@ #include "BKE_context.h" #include "BKE_layer.h" #include "BKE_main.h" +#include "BKE_object.h" #include "BKE_undo_system.h" #include "DEG_depsgraph.h" @@ -190,7 +191,7 @@ static void armature_undosys_step_decode(struct bContext *C, ED_undo_object_editmode_restore_helper( C, &us->elems[0].obedit_ref.ptr, us->elems_len, sizeof(*us->elems)); - BLI_assert(armature_undosys_poll(C)); + BLI_assert(BKE_object_is_in_editmode(us->elems[0].obedit_ref.ptr)); for (uint i = 0; i < us->elems_len; i++) { ArmatureUndoStep_Elem *elem = &us->elems[i]; @@ -213,6 +214,9 @@ static void armature_undosys_step_decode(struct bContext *C, ED_undo_object_set_active_or_warn( CTX_data_view_layer(C), us->elems[0].obedit_ref.ptr, us_p->name, &LOG); + /* Check after setting active. */ + BLI_assert(armature_undosys_poll(C)); + bmain->is_memfile_undo_flush_needed = true; WM_event_add_notifier(C, NC_GEOM | ND_DATA, NULL); -- cgit v1.2.3