griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: Boundary brush crash when not on boundary

Browse Source 
Introduced with 4b9f286af0.

Pull Request: https://projects.blender.org/blender/blender/pulls/125686
This commit is contained in:
Sean Kim
2024-07-31 04:05:00 +02:00
committed by Sean Kim
parent 14b03fca3c
commit 7b05c2b7ed
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/blender/editors/sculpt_paint/sculpt_boundary.cc
View File

@@ -1402,28 +1402,30 @@ void do_boundary_brush(const Sculpt &sd, Object &ob, Span<bke::pbvh::Node *> nod
ss.cache->boundaries[symm_area] = data_init(
ob, &brush, initial_vert, ss.cache->initial_radius);
/* No active boundary under the cursor. */
if (!ss.cache->boundaries[symm_area]) {
return;
}
if (ss.cache->boundaries[symm_area]) {
switch (brush.boundary_deform_type) {
case BRUSH_BOUNDARY_DEFORM_BEND:
bend_data_init(ob, *ss.cache->boundaries[symm_area]);
break;
case BRUSH_BOUNDARY_DEFORM_EXPAND:
slide_data_init(ob, *ss.cache->boundaries[symm_area]);
break;
case BRUSH_BOUNDARY_DEFORM_TWIST:
twist_data_init(ob, *ss.cache->boundaries[symm_area]);
break;
case BRUSH_BOUNDARY_DEFORM_INFLATE:
case BRUSH_BOUNDARY_DEFORM_GRAB:
/* Do nothing. These deform modes don't need any extra data to be precomputed. */
break;
}
switch (brush.boundary_deform_type) {
case BRUSH_BOUNDARY_DEFORM_BEND:
bend_data_init(ob, *ss.cache->boundaries[symm_area]);
break;
case BRUSH_BOUNDARY_DEFORM_EXPAND:
slide_data_init(ob, *ss.cache->boundaries[symm_area]);
break;
case BRUSH_BOUNDARY_DEFORM_TWIST:
twist_data_init(ob, *ss.cache->boundaries[symm_area]);
break;
case BRUSH_BOUNDARY_DEFORM_INFLATE:
case BRUSH_BOUNDARY_DEFORM_GRAB:
/* Do nothing. These deform modes don't need any extra data to be precomputed. */
break;
init_falloff(brush, ss.cache->initial_radius, *ss.cache->boundaries[symm_area]);
}
}
init_falloff(brush, ss.cache->initial_radius, *ss.cache->boundaries[symm_area]);
/* No active boundary under the cursor. */
if (!ss.cache->boundaries[symm_area]) {
return;
}
switch (brush.boundary_deform_type) {