blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Mesh Batch Cache: Fix regression with mesh that have poly mat id > mat_len

This commit is contained in:
Clément Foucault 2019-08-18 22:40:47 +02:00
parent 38380ddca3
commit 10001d9099
Notes: blender-bot 2023-02-14 06:00:50 +01:00 
Referenced by issue #68843, Invalid (pink) shader when using wireframe node [ Eevee ]
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/draw/intern/draw_cache_extract_mesh.c
View File

@ -454,7 +454,8 @@ static void *extract_tris_init(const MeshRenderData *mr, void *UNUSED(ibo))
BMFace *efa;
BM_ITER_MESH (efa, &iter, mr->bm, BM_FACES_OF_MESH) {
if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
mat_tri_len[efa->mat_nr] += efa->len - 2;
int mat = min_ii(efa->mat_nr, mr->mat_len - 1);
mat_tri_len[mat] += efa->len - 2;
}
}
}
@ -462,7 +463,8 @@ static void *extract_tris_init(const MeshRenderData *mr, void *UNUSED(ibo))
const MPoly *mpoly = mr->mpoly;
for (int p = 0; p < mr->poly_len; p++, mpoly++) {
if (!(mr->use_hide && (mpoly->flag & ME_HIDE))) {
mat_tri_len[mpoly->mat_nr] += mpoly->totloop - 2;
int mat = min_ii(mpoly->mat_nr, mr->mat_len - 1);
mat_tri_len[mat] += mpoly->totloop - 2;
}
}
}
@ -508,8 +510,9 @@ static void extract_tris_looptri_mesh(const MeshRenderData *mr,
if (!(mr->use_hide && (mpoly->flag & ME_HIDE))) {
MeshExtract_Tri_Data *data = _data;
int *mat_tri_ofs = data->tri_mat_end;
int mat = min_ii(mpoly->mat_nr, mr->mat_len - 1);
GPU_indexbuf_set_tri_verts(
&data->elb, mat_tri_ofs[mpoly->mat_nr]++, mlt->tri[0], mlt->tri[1], mlt->tri[2]);
&data->elb, mat_tri_ofs[mat]++, mlt->tri[0], mlt->tri[1], mlt->tri[2]);
}
}