blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Sculpt Expand: Fix crash when editing an existing face set with Multires

This commit is contained in:
Pablo Dobarro 2021-02-15 18:56:58 +01:00
parent d4548fe55b
commit 4288b2a1d1
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -700,6 +700,8 @@ static void sculpt_expand_geodesics_from_state_boundary(Object *ob,
BLI_bitmap *enabled_vertices)
{
SculptSession *ss = ob->sculpt;
BLI_assert(BKE_pbvh_type(ss->pbvh) == PBVH_FACES);
GSet *initial_vertices = BLI_gset_int_new("initial_vertices");
BLI_bitmap *boundary_vertices = sculpt_expand_boundary_from_enabled(ss, enabled_vertices, false);
const int totvert = SCULPT_vertex_count_get(ss);
@ -768,7 +770,12 @@ static void sculpt_expand_initialize_from_face_set_boundary(Object *ob,
BLI_BITMAP_ENABLE(enabled_vertices, i);
}
sculpt_expand_geodesics_from_state_boundary(ob, expand_cache, enabled_vertices);
if (BKE_pbvh_type(ss->pbvh) == PBVH_FACES) {
sculpt_expand_geodesics_from_state_boundary(ob, expand_cache, enabled_vertices);
}
else {
sculpt_expand_topology_from_state_boundary(ob, expand_cache, enabled_vertices);
}
MEM_freeN(enabled_vertices);