blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 768 Projects 19 Wiki Activity

Sculpt: fix T102067: Set material properly in new pbvh draw 

Note: Still need to fix PBVH_BMESH.
This commit is contained in:
Joseph Eagar 2022-10-26 19:00:55 +02:00
parent 414d5429fe
commit bc7de854c9
Notes: blender-bot 2023-02-14 01:35:49 +01:00 
Referenced by issue #102067, Regression: Sculpt mode shows entire mesh using only the first material
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/draw/intern/draw_pbvh.cc
View File

@ -951,6 +951,13 @@ struct PBVHBatches {
void create_index_faces(PBVH_GPU_Args *args)
{
int *mat_index = static_cast<int*>(CustomData_get_layer_named(args->pdata, CD_PROP_INT32, "material_index"));
if (mat_index && args->totprim) {
int poly_index = args->mlooptri[args->prim_indices[0]].poly;
material_index = mat_index[poly_index];
}
/* Calculate number of edges*/
int edge_count = 0;
for (int i = 0; i < args->totprim; i++) {
@ -959,6 +966,7 @@ struct PBVHBatches {
if (args->hide_poly && args->hide_poly[lt->poly]) {
continue;
}
int r_edges[3];
BKE_mesh_looptri_get_real_edges(args->me, lt, r_edges);
@ -1030,6 +1038,14 @@ struct PBVHBatches {
void create_index_grids(PBVH_GPU_Args *args)
{
int *mat_index = static_cast<int *>(
CustomData_get_layer_named(args->pdata, CD_PROP_INT32, "material_index"));
if (mat_index && args->totprim) {
int poly_index = BKE_subdiv_ccg_grid_to_face_index(args->subdiv_ccg, args->grid_indices[0]);
material_index = mat_index[poly_index];
}
needs_tri_index = true;
int gridsize = args->ccg_key.grid_size;
int totgrid = args->totprim;