diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2022-09-29 23:14:42 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2022-09-29 23:14:42 +0300 |
| commit | 6a9b45995d8a9a1b88f9fbac892a573e461db8f4 (patch) | |
| tree | d6d4ece7550cae314c62bd8d13997b4226ec25a9 | |
| parent | f998fa2732a9b707645df902fdc943a6d3fad95d (diff) | |
Sculpt: Fix T101464: Crash in mask from cavity
| -rw-r--r-- | source/blender/editors/sculpt_paint/sculpt_ops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/sculpt_paint/sculpt_ops.c b/source/blender/editors/sculpt_paint/sculpt_ops.c index 7ad905e5788..4e280e1d0a0 100644 --- a/source/blender/editors/sculpt_paint/sculpt_ops.c +++ b/source/blender/editors/sculpt_paint/sculpt_ops.c @@ -1034,7 +1034,7 @@ static void sculpt_bake_cavity_exec_task_cb(void *__restrict userdata, SCULPT_undo_push_node(tdata->ob, node, SCULPT_UNDO_MASK); AutomaskingNodeData automask_data; - SCULPT_automasking_node_begin(tdata->ob, ss, ss->cache->automasking, &automask_data, node); + SCULPT_automasking_node_begin(tdata->ob, ss, tdata->automasking, &automask_data, node); BKE_pbvh_vertex_iter_begin (ss->pbvh, node, vd, PBVH_ITER_UNIQUE) { SCULPT_automasking_node_update(ss, &automask_data, &vd); @@ -1136,6 +1136,8 @@ static int sculpt_bake_cavity_exec(bContext *C, wmOperator *op) brush2.automasking_boundary_edges_propagation_steps = 1; brush2.automasking_cavity_curve = sd2.automasking_cavity_curve; + SCULPT_stroke_id_next(ob); + tdata.ob = ob; tdata.mode = mode; tdata.factor = factor; @@ -1143,8 +1145,6 @@ static int sculpt_bake_cavity_exec(bContext *C, wmOperator *op) tdata.nodes = nodes; tdata.automasking = SCULPT_automasking_cache_init(&sd2, &brush2, ob); - SCULPT_stroke_id_next(ob); - TaskParallelSettings settings; BKE_pbvh_parallel_range_settings(&settings, true, totnode); BLI_task_parallel_range(0, totnode, &tdata, sculpt_bake_cavity_exec_task_cb, &settings); |