diff options
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_pbvh.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pbvh.c | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pbvh_intern.h | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h index 6097fab814f..16a7e4d38d0 100644 --- a/source/blender/blenkernel/BKE_pbvh.h +++ b/source/blender/blenkernel/BKE_pbvh.h @@ -299,7 +299,7 @@ void BKE_pbvh_grids_update(PBVH *bvh, struct DMFlagMat *flagmats, unsigned int **grid_hidden); -void BKE_pbvh_face_sets_color_seed_set(PBVH *bvh, int seed); +void BKE_pbvh_face_sets_color_set(PBVH *bvh, int seed, int color_default); /* Layer displacement */ diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index 61caccccf90..ae20e5d023d 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -565,6 +565,7 @@ void BKE_pbvh_build_mesh(PBVH *bvh, bvh->pdata = pdata; bvh->face_sets_color_seed = mesh->face_sets_color_seed; + bvh->face_sets_color_default = mesh->face_sets_color_default; BB_reset(&cb); @@ -1304,6 +1305,7 @@ static void pbvh_update_draw_buffer_cb(void *__restrict userdata, CustomData_get_layer(bvh->ldata, CD_MLOOPCOL), CustomData_get_layer(bvh->pdata, CD_SCULPT_FACE_SETS), bvh->face_sets_color_seed, + bvh->face_sets_color_default, node->face_vert_indices, update_flags); break; @@ -2615,9 +2617,10 @@ void BKE_pbvh_update_normals(PBVH *bvh, struct SubdivCCG *subdiv_ccg) MEM_SAFE_FREE(nodes); } -void BKE_pbvh_face_sets_color_seed_set(PBVH *bvh, int seed) +void BKE_pbvh_face_sets_color_set(PBVH *bvh, int seed, int color_default) { bvh->face_sets_color_seed = seed; + bvh->face_sets_color_default = color_default; } /** diff --git a/source/blender/blenkernel/intern/pbvh_intern.h b/source/blender/blenkernel/intern/pbvh_intern.h index 51342eb1faa..af92f11e219 100644 --- a/source/blender/blenkernel/intern/pbvh_intern.h +++ b/source/blender/blenkernel/intern/pbvh_intern.h @@ -137,6 +137,7 @@ struct PBVH { CustomData *pdata; int face_sets_color_seed; + int face_sets_color_default; /* Grid Data */ CCGKey gridkey; |