blender
/
blender
134
399
Fork 582
Code Issues 6.3k Pull Requests 757 Projects 19 Wiki Activity

Fix T61778: Crash when adding material slot to object 

For some reason the mat_nr can be superior to the number of material slots
present on an object. Just cap this number to the max available slot.
This commit is contained in:
Clément Foucault 2019-03-05 18:58:22 +01:00
parent d1a744173e
commit c94db5d1c7
Notes: blender-bot 2023-12-08 16:39:08 +01:00 
Referenced by issue #61778, Crash when adding material slot to object
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/draw/intern/draw_cache_impl_mesh.c
View File

@ -3587,7 +3587,7 @@ static void mesh_create_loops_tris(
if (BM_elem_flag_test(bm_face, BM_ELEM_HIDDEN)) {
continue;
}
int mat = (ibo_len > 1) ? bm_face->mat_nr : 0;
int mat = min_ii(ibo_len - 1, bm_face->mat_nr);
GPU_indexbuf_add_tri_verts(
&elb[mat],
BM_elem_index_get(bm_looptri[0]),
@ -3602,7 +3602,7 @@ static void mesh_create_loops_tris(
if (use_hide && (mp->flag & ME_HIDE)) {
continue;
}
int mat = (ibo_len > 1) ? mp->mat_nr : 0;
int mat = min_ii(ibo_len - 1, mp->mat_nr);
GPU_indexbuf_add_tri_verts(&elb[mat], mlt->tri[0], mlt->tri[1], mlt->tri[2]);
}
}
@ -3620,7 +3620,7 @@ static void mesh_create_loops_tris(
/* Assume 'use_hide' */
BMFace *efa = BM_face_at_index(bm, p_orig);
if (!BM_elem_flag_test(efa, BM_ELEM_HIDDEN)) {
int mat = (ibo_len > 1) ? efa->mat_nr : 0;
int mat = min_ii(ibo_len - 1, efa->mat_nr);
GPU_indexbuf_add_tri_verts(&elb[mat], mlt->tri[0], mlt->tri[1], mlt->tri[2]);
}
}