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 +++++- source/blender/editors/curve/editcurve_undo.c | 6 +++++- source/blender/editors/lattice/editlattice_undo.c | 6 +++++- source/blender/editors/mesh/editmesh_undo.c | 6 +++++- source/blender/editors/metaball/editmball_undo.c | 9 ++++++++- 5 files changed, 28 insertions(+), 5 deletions(-) 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); 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); diff --git a/source/blender/editors/lattice/editlattice_undo.c b/source/blender/editors/lattice/editlattice_undo.c index 3ffbc3712fc..94b3dfbfe88 100644 --- a/source/blender/editors/lattice/editlattice_undo.c +++ b/source/blender/editors/lattice/editlattice_undo.c @@ -40,6 +40,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" @@ -224,7 +225,7 @@ static void lattice_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(lattice_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++) { LatticeUndoStep_Elem *elem = &us->elems[i]; @@ -247,6 +248,9 @@ static void lattice_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(lattice_undosys_poll(C)); + bmain->is_memfile_undo_flush_needed = true; WM_event_add_notifier(C, NC_GEOM | ND_DATA, NULL); diff --git a/source/blender/editors/mesh/editmesh_undo.c b/source/blender/editors/mesh/editmesh_undo.c index cea006f0faa..e46363eafcc 100644 --- a/source/blender/editors/mesh/editmesh_undo.c +++ b/source/blender/editors/mesh/editmesh_undo.c @@ -39,6 +39,7 @@ #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_mesh.h" +#include "BKE_object.h" #include "BKE_undo_system.h" #include "DEG_depsgraph.h" @@ -778,7 +779,7 @@ static void mesh_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(mesh_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++) { MeshUndoStep_Elem *elem = &us->elems[i]; @@ -802,6 +803,9 @@ static void mesh_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(mesh_undosys_poll(C)); + Scene *scene = CTX_data_scene(C); scene->toolsettings->selectmode = us->elems[0].data.selectmode; diff --git a/source/blender/editors/metaball/editmball_undo.c b/source/blender/editors/metaball/editmball_undo.c index b817bc3a718..86f67879c5f 100644 --- a/source/blender/editors/metaball/editmball_undo.c +++ b/source/blender/editors/metaball/editmball_undo.c @@ -38,6 +38,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" @@ -199,7 +200,7 @@ static void mball_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(mball_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++) { MBallUndoStep_Elem *elem = &us->elems[i]; @@ -222,6 +223,12 @@ static void mball_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(BKE_object_is_in_editmode(us->elems[0].obedit_ref.ptr)); + + BLI_assert(mball_undosys_poll(C)); + bmain->is_memfile_undo_flush_needed = true; WM_event_add_notifier(C, NC_GEOM | ND_DATA, NULL); -- cgit v1.2.3