blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Sculpt Expand: Fix wrong expandcache ref when finishing expand

This commit is contained in:
Pablo Dobarro 2021-02-14 18:06:43 +01:00
parent 30434e3904
commit 6ee1db0d67
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/sculpt_paint/sculpt_expand.c
View File

@ -853,7 +853,7 @@ static void sculpt_expand_falloff_factors_from_vertex_and_symm_create(
}
}
static void sculpt_expand_cache_free(ExpandCache *expand_cache)
static void sculpt_expand_cache_data_free(ExpandCache *expand_cache)
{
if (expand_cache->snap_enabled_face_sets) {
BLI_gset_free(expand_cache->snap_enabled_face_sets, NULL);
@ -868,6 +868,12 @@ static void sculpt_expand_cache_free(ExpandCache *expand_cache)
MEM_SAFE_FREE(expand_cache);
}
static void sculpt_expand_cache_free(SculptSession *ss) {
sculpt_expand_cache_data_free(ss->expand_cache);
ss->expand_cache = NULL;
}
static void sculpt_expand_restore_face_set_data(SculptSession *ss, ExpandCache *expand_cache)
{
PBVHNode **nodes;
@ -954,7 +960,7 @@ static void sculpt_expand_cancel(bContext *C, wmOperator *UNUSED(op))
sculpt_expand_restore_original_state(C, ob, ss->expand_cache);
SCULPT_undo_push_end();
sculpt_expand_cache_free(ss->expand_cache);
sculpt_expand_cache_free(ss);
}
static void sculpt_expand_mask_update_task_cb(void *__restrict userdata,
@ -1265,7 +1271,7 @@ static void sculpt_expand_finish(bContext *C)
break;
}
sculpt_expand_cache_free(ss->expand_cache);
sculpt_expand_cache_free(ss);
ED_workspace_status_text(C, NULL);
}