griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #142245: Crash adding subsurf with invalid material indices

Browse Source 
Bounds check material indices since they may exceed the total number of
materials. This looks to be an oversight in [0] which added support
for an OpenGL evaluator.

[0] eed45d2a23
This commit is contained in:
Campbell Barton
2025-07-20 19:43:49 +10:00
parent 008ed81d26
commit f8c0d504f4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/draw/intern/draw_cache_impl_subdivision.cc
View File

@@ -1526,7 +1526,7 @@ static void draw_subdiv_cache_ensure_mat_offsets(DRWSubdivCache &cache,
const int next_offset = (i == mesh_eval->faces_num - 1) ? number_of_quads :
subdiv_face_offset[i + 1];
const int quad_count = next_offset - subdiv_face_offset[i];
const int mat_index = material_indices[i];
const uint mat_index = uint(material_indices[i]) < mat_len ? uint(material_indices[i]) : 0;
mat_start[mat_index] += quad_count;
}
@@ -1544,7 +1544,7 @@ static void draw_subdiv_cache_ensure_mat_offsets(DRWSubdivCache &cache,
int *per_face_mat_offset = MEM_malloc_arrayN<int>(mesh_eval->faces_num, "per_face_mat_offset");
for (int i = 0; i < mesh_eval->faces_num; i++) {
const int mat_index = material_indices[i];
const uint mat_index = uint(material_indices[i]) < mat_len ? uint(material_indices[i]) : 0;
const int single_material_index = subdiv_face_offset[i];
const int material_offset = mat_end[mat_index];
const int next_offset = (i == mesh_eval->faces_num - 1) ? number_of_quads :