tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Sculpt: Fix #107093: expand helper function not specialized to pbvh 

sculpt_expand_is_face_in_active_component wasn't specialzied for
the different PBVH types.
This commit is contained in:
Joseph Eagar 2023-04-19 12:58:08 -07:00
parent 2ab500c234
commit e05cbad0d1
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/editors/sculpt_paint/sculpt_expand.cc
View File

@ -148,8 +148,24 @@ static bool sculpt_expand_is_face_in_active_component(SculptSession *ss,
ExpandCache *expand_cache,
const int f)
{
const int vert = ss->corner_verts[ss->polys[f].start()];
return sculpt_expand_is_vert_in_active_component(ss, expand_cache, BKE_pbvh_make_vref(vert));
PBVHVertRef vertex;
switch (BKE_pbvh_type(ss->pbvh)) {
case PBVH_FACES:
vertex.i = ss->corner_verts[ss->polys[f].start()];
break;
case PBVH_GRIDS: {
const CCGKey *key = BKE_pbvh_get_grid_key(ss->pbvh);
vertex.i = ss->polys[f].start() * key->grid_area;
break;
}
case PBVH_BMESH: {
vertex.i = reinterpret_cast<intptr_t>(ss->bm->ftable[f]->l_first->v);
break;
}
}
return sculpt_expand_is_vert_in_active_component(ss, expand_cache, vertex);
}
/**