diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-02-25 07:43:30 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-02-25 08:13:53 +0300 |
commit | e301f3422d9922598e0cabf12a4e22eda0ae0880 (patch) | |
tree | 630560a8b65b50b212b0d010972bf1cd8ec299f0 /source/blender/editors/curve | |
parent | 2b60d7d09c51716e8d98834061c1a61ed6b96cf5 (diff) |
Fix T85974: Edit-mode undo/redo causes assertion
Assert the poll function succeeds after setting the active object.
Diffstat (limited to 'source/blender/editors/curve')
-rw-r--r-- | source/blender/editors/curve/editcurve_undo.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/curve/editcurve_undo.c b/source/blender/editors/curve/editcurve_undo.c index 61106667d8f..8f7aa786da5 100644 --- a/source/blender/editors/curve/editcurve_undo.c +++ b/source/blender/editors/curve/editcurve_undo.c @@ -36,6 +36,7 @@ #include "BKE_fcurve.h" #include "BKE_layer.h" #include "BKE_main.h" +#include "BKE_object.h" #include "BKE_undo_system.h" #include "DEG_depsgraph.h" @@ -251,7 +252,7 @@ static void curve_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(curve_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++) { CurveUndoStep_Elem *elem = &us->elems[i]; @@ -274,6 +275,9 @@ static void curve_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(curve_undosys_poll(C)); + bmain->is_memfile_undo_flush_needed = true; WM_event_add_notifier(C, NC_GEOM | ND_DATA, NULL); |