blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Sculpt Expand: Fix multiple crashes when using modifiers

This commit is contained in:
Pablo Dobarro 2021-02-03 00:36:54 +01:00
parent c191344efb
commit b40f1f4c79
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -708,9 +708,8 @@ static void sculpt_expand_falloff_factors_from_vertex_and_symm_create(
const int vertex,
eSculptExpandFalloffType falloff_type)
{
if (expand_cache->falloff_factor) {
MEM_freeN(expand_cache->falloff_factor);
}
MEM_SAFE_FREE(expand_cache->falloff_factor);
switch (falloff_type) {
case SCULPT_EXPAND_FALLOFF_GEODESICS:
@ -1257,6 +1256,15 @@ static int sculpt_expand_modal(bContext *C, wmOperator *op, const wmEvent *event
SculptSession *ss = ob->sculpt;
Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
if (!ELEM(event->type, MOUSEMOVE, EVT_MODAL_MAP)) {
return OPERATOR_RUNNING_MODAL;
}
Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C);
BKE_sculpt_update_object_for_edit(depsgraph, ob, true, true, false);
SCULPT_vertex_random_access_ensure(ss);
SCULPT_boundary_info_ensure(ob);
const float mouse[2] = {event->mval[0], event->mval[1]};
const int target_expand_vertex = sculpt_expand_target_vertex_update_and_get(C, ob, mouse);
@ -1376,10 +1384,6 @@ static int sculpt_expand_modal(bContext *C, wmOperator *op, const wmEvent *event
}
}
if (!ELEM(event->type, MOUSEMOVE, EVT_MODAL_MAP)) {
return OPERATOR_RUNNING_MODAL;
}
if (expand_cache->move) {
sculpt_expand_move_propagation_origin(C, ob, event, expand_cache);
}