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

Fix: Multires crash after recent face set refactor

Browse Source 
Missing null check when retrieving face sets for multires automasking.
Caused by b5f7af31d6.
This commit is contained in:
Hans Goudey
2022-09-12 14:15:43 -05:00
parent 752a9b743e
commit 5bad311f4c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -329,8 +329,14 @@ int SCULPT_active_face_set_get(SculptSession *ss)
{
switch (BKE_pbvh_type(ss->pbvh)) {
case PBVH_FACES:
return ss->face_sets ? ss->face_sets[ss->active_face_index] : SCULPT_FACE_SET_NONE;
if (!ss->face_sets) {
return SCULPT_FACE_SET_NONE;
}
return ss->face_sets[ss->active_face_index];
case PBVH_GRIDS: {
if (!ss->face_sets) {
return SCULPT_FACE_SET_NONE;
}
const int face_index = BKE_subdiv_ccg_grid_to_face_index(ss->subdiv_ccg,
ss->active_grid_index);
return ss->face_sets[face_index];