blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Sculpt: Fix face set boundary flag settings in PBVH_FACES

This commit is contained in:
Joseph Eagar 2021-10-04 11:42:49 -07:00
parent ea19c3a4b8
commit f8df47977c
4 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/paint.c
View File

@ -2340,6 +2340,9 @@ static void init_mdyntopo_layer_faces(SculptSession *ss, PBVH *pbvh, int totvert
ss->mdyntopo_verts,
ss->pmap,
vertex);
// can't fully update boundary here, so still flag for update
mv->flag |= DYNVERT_NEED_BOUNDARY;
}
}
@ -2363,6 +2366,9 @@ static void init_mdyntopo_layer_grids(SculptSession *ss, PBVH *pbvh, int totvert
SculptVertRef vertex = {.i = i};
BKE_pbvh_update_vert_boundary_grids(pbvh, ss->subdiv_ccg, vertex);
// can't fully update boundary here, so still flag for update
mv->flag |= DYNVERT_NEED_BOUNDARY;
}
}

9
source/blender/blenkernel/intern/pbvh.c
View File

@ -4180,8 +4180,8 @@ void BKE_pbvh_update_vert_boundary_faces(int *face_sets,
MDynTopoVert *mv = mdyntopo_verts + vertex.i;
MeshElemMap *vert_map = &pmap[vertex.i];
int last_fset = 0;
int last_fset2 = 0;
int last_fset = -1;
int last_fset2 = -1;
mv->flag &= ~(DYNVERT_BOUNDARY | DYNVERT_FSET_BOUNDARY | DYNVERT_NEED_BOUNDARY |
DYNVERT_FSET_CORNER | DYNVERT_CORNER | DYNVERT_SEAM_BOUNDARY |
@ -4216,7 +4216,7 @@ void BKE_pbvh_update_vert_boundary_faces(int *face_sets,
}
}
int fset = face_sets ? face_sets[f_i] : -1;
int fset = face_sets ? abs(face_sets[f_i]) : -1;
if (fset > 0) {
visible = true;
@ -4228,7 +4228,8 @@ void BKE_pbvh_update_vert_boundary_faces(int *face_sets,
if (i > 0 && fset != last_fset) {
mv->flag |= DYNVERT_FSET_BOUNDARY;
if (i > 1 && last_fset2 != last_fset) {
if (i > 1 && last_fset2 != last_fset && last_fset != -1 && last_fset2 != -1 && fset != -1 &&
last_fset2 != fset) {
mv->flag |= DYNVERT_FSET_CORNER;
}
}

3
source/blender/bmesh/bmesh_class.h
View File

@ -448,8 +448,7 @@ enum {
BMElem *, BMElemF *, BMHeader *
#define _BM_GENERIC_TYPE_ELEM_CONST \
const void *, const BMVert *, const BMEdge *, const BMLoop *, const BMFace *, \
const BMVert_OFlag *, const BMEdge_OFlag *, const BMFace_OFlag *, const BMElem *, \
const void *, const BMVert *, const BMEdge *, const BMLoop *, const BMFace *, const BMElem *, \
const BMElemF *, const BMHeader *, void *const, BMVert *const, BMEdge *const, \
BMLoop *const, BMFace *const, BMElem *const, BMElemF *const, BMHeader *const

17
source/blender/editors/sculpt_paint/sculpt.c
View File

@ -2177,11 +2177,26 @@ static void faces_update_boundary_flags(const SculptSession *ss, const SculptVer
// have to handle boundary here
MDynTopoVert *mv = ss->mdyntopo_verts + vertex.i;
mv->flag &= ~(DYNVERT_CORNER | DYNVERT_BOUNDARY);
if (sculpt_check_boundary_vertex_in_base_mesh(ss, vertex)) {
mv->flag |= DYNVERT_BOUNDARY;
if (ss->pmap[vertex.i].count < 4) {
mv->flag |= DYNVERT_CORNER;
bool ok = true;
for (int i = 0; i < ss->pmap[vertex.i].count; i++) {
MPoly *mp = ss->mpoly + ss->pmap[vertex.i].indices[i];
if (mp->totloop < 4) {
ok = false;
}
}
if (ok) {
mv->flag |= DYNVERT_CORNER;
}
else {
mv->flag &= ~DYNVERT_CORNER;
}
}
}
}