Fix T81854: crash when undoing switch between sculpt and edit mode.
The logic of `BKE_sculpt_update_object_for_edit` was not correct. such low-level functions should typically never preform depsgraph evaluation themselves, they should be able to rely on getting a fully evaluated depsgraph and just get needed data from there. Supporting that required fixing other broken code higher in the callstack, namely: * `ED_object_sculptmode_enter_ex` was freeing evaluated data, for no valid reason it would seem. * `sculpt_undosys_step_decode` was ensuring an evaluated depsgraph **before** calling `ED_object_mode_generic_exit`, which would invalidate a lot of evaluated data. Note that it is fairly difficult to track down all code paths leading to `BKE_sculpt_update_object_for_edit`, so there may be still cases where this gets called with improperly evaluated depsgraph. Reviewed By: sergey Maniphest Tasks: T81854 Differential Revision: https://developer.blender.org/D9270
This commit is contained in:
parent
8926b09fa9
commit
0845dc0eec
Notes:
blender-bot
2023-02-14 10:21:11 +01:00
Referenced by issue #81854, Crash in undoing switch from sculpt to edit mode and back. Referenced by issue #77348, Blender LTS: Maintenance Task 2.83
|
@ -1664,19 +1664,18 @@ void BKE_sculpt_update_object_after_eval(Depsgraph *depsgraph, Object *ob_eval)
|
|||
sculpt_update_object(depsgraph, ob_orig, me_eval, false, false);
|
||||
}
|
||||
|
||||
/** \warning Expects a fully evaluated depsgraph. */
|
||||
void BKE_sculpt_update_object_for_edit(Depsgraph *depsgraph,
|
||||
Object *ob_orig,
|
||||
bool need_pmap,
|
||||
bool need_mask)
|
||||
{
|
||||
/* Update from sculpt operators and undo, to update sculpt session
|
||||
* and PBVH after edits. */
|
||||
Scene *scene_eval = DEG_get_evaluated_scene(depsgraph);
|
||||
Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob_orig);
|
||||
Mesh *me_eval = mesh_get_eval_final(depsgraph, scene_eval, ob_eval, &CD_MASK_BAREMESH);
|
||||
|
||||
BLI_assert(ob_orig == DEG_get_original_object(ob_orig));
|
||||
|
||||
Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob_orig);
|
||||
Mesh *me_eval = BKE_object_get_evaluated_mesh(ob_eval);
|
||||
BLI_assert(me_eval != NULL);
|
||||
|
||||
sculpt_update_object(depsgraph, ob_orig, me_eval, need_pmap, need_mask);
|
||||
}
|
||||
|
||||
|
|
|
@ -7524,6 +7524,7 @@ static void SCULPT_OT_symmetrize(wmOperatorType *ot)
|
|||
|
||||
/**** Toggle operator for turning sculpt mode on or off ****/
|
||||
|
||||
/** \warning Expects a fully evaluated depsgraph. */
|
||||
static void sculpt_init_session(Depsgraph *depsgraph, Scene *scene, Object *ob)
|
||||
{
|
||||
/* Create persistent sculpt mode data. */
|
||||
|
@ -7587,6 +7588,7 @@ void ED_object_sculptmode_enter_ex(Main *bmain,
|
|||
|
||||
if (flush_recalc) {
|
||||
DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
|
||||
BKE_scene_graph_evaluated_ensure(depsgraph, bmain);
|
||||
}
|
||||
|
||||
/* Create sculpt mode session data. */
|
||||
|
@ -7594,10 +7596,6 @@ void ED_object_sculptmode_enter_ex(Main *bmain,
|
|||
BKE_sculptsession_free(ob);
|
||||
}
|
||||
|
||||
/* Make sure derived final from original object does not reference possibly
|
||||
* freed memory. */
|
||||
BKE_object_free_derived_caches(ob);
|
||||
|
||||
sculpt_init_session(depsgraph, scene, ob);
|
||||
|
||||
/* Mask layer is required. */
|
||||
|
|
|
@ -1443,8 +1443,6 @@ static void sculpt_undosys_step_decode(
|
|||
{
|
||||
Scene *scene = CTX_data_scene(C);
|
||||
ViewLayer *view_layer = CTX_data_view_layer(C);
|
||||
/* Sculpt needs evaluated state. */
|
||||
BKE_scene_view_layer_graph_evaluated_ensure(bmain, scene, view_layer);
|
||||
Object *ob = OBACT(view_layer);
|
||||
if (ob && (ob->type == OB_MESH)) {
|
||||
if (ob->mode & OB_MODE_SCULPT) {
|
||||
|
@ -1452,6 +1450,12 @@ static void sculpt_undosys_step_decode(
|
|||
}
|
||||
else {
|
||||
ED_object_mode_generic_exit(bmain, depsgraph, scene, ob);
|
||||
|
||||
/* Sculpt needs evaluated state.
|
||||
* Note: needs to be done here, as #ED_object_mode_generic_exit will usually invalidate
|
||||
* (some) evaluated data. */
|
||||
BKE_scene_graph_evaluated_ensure(depsgraph, bmain);
|
||||
|
||||
Mesh *me = ob->data;
|
||||
/* Don't add sculpt topology undo steps when reading back undo state.
|
||||
* The undo steps must enter/exit for us. */
|
||||
|
|
Loading…
Reference in New Issue