diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-11-06 20:26:53 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-11-06 20:26:53 +0300 |
| commit | d52ddfa6ccc91a97562fc90fee3ef1f3eab774fd (patch) | |
| tree | 2dd256d18bddafbae44febbfd0fa717f366dc569 /source/blender/draw | |
| parent | 7ef03eae20c8613f52b4cfca3919b9a871860f3e (diff) | |
| parent | 64cd9a079b987e1ef3daf926bd5af26185e297a5 (diff) | |
Merge branch 'blender-v2.81-release'
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/intern/draw_cache_extract_mesh.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.c b/source/blender/draw/intern/draw_cache_extract_mesh.c index fb439016a87..c30cf9f6328 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh.c +++ b/source/blender/draw/intern/draw_cache_extract_mesh.c @@ -484,7 +484,7 @@ static void *extract_tris_init(const MeshRenderData *mr, void *UNUSED(ibo)) return data; } -static void extract_tris_looptri_bmesh(const MeshRenderData *UNUSED(mr), +static void extract_tris_looptri_bmesh(const MeshRenderData *mr, int UNUSED(t), BMLoop **elt, void *_data) @@ -492,8 +492,9 @@ static void extract_tris_looptri_bmesh(const MeshRenderData *UNUSED(mr), if (!BM_elem_flag_test(elt[0]->f, BM_ELEM_HIDDEN)) { MeshExtract_Tri_Data *data = _data; int *mat_tri_ofs = data->tri_mat_end; + int mat = min_ii(elt[0]->f->mat_nr, mr->mat_len - 1); GPU_indexbuf_set_tri_verts(&data->elb, - mat_tri_ofs[elt[0]->f->mat_nr]++, + mat_tri_ofs[mat]++, BM_elem_index_get(elt[0]), BM_elem_index_get(elt[1]), BM_elem_index_get(elt[2])); |