bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Fix T77195: Crash with edit-mesh viewport measurements enabled

Browse Source 
Simplify looping over faces & tessellation data.

Regression in 6526c3ced8b5, the index accessed wasn't valid.
This commit is contained in:
Campbell Barton 2020-06-10 13:36:30 +10:00
parent 46e0ec05ef
commit 48ca66cfe7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/draw/intern/draw_manager_text.c
View File

@ -395,16 +395,19 @@ void DRW_text_edit_mesh_measure_stats(ARegion *region,
UI_GetThemeColor3ubv(TH_DRAWEXTRA_FACEAREA, col);
int i, n, numtri;
int i, n;
BMFace *f = NULL;
/* Alternative to using `poly_to_tri_count(i, BM_elem_index_get(f->l_first))`
* without having to add an extra loop. */
int looptri_index = 0;
BM_ITER_MESH_INDEX (f, &iter, em->bm, BM_FACES_OF_MESH, i) {
const int f_looptri_len = f->len - 2;
if (BM_elem_flag_test(f, BM_ELEM_SELECT)) {
n = 0;
numtri = f->len - 2;
area = 0;
zero_v3(vmid);
BMLoop *(*l)[3] = &em->looptris[poly_to_tri_count(i, BM_elem_index_get(f->l_first))];
for (int j = 0; j < numtri; j++) {
BMLoop *(*l)[3] = &em->looptris[looptri_index];
for (int j = 0; j < f_looptri_len; j++) {
if (use_coords) {
copy_v3_v3(v1, vert_coords[BM_elem_index_get(l[j][0]->v)]);
@ -449,6 +452,7 @@ void DRW_text_edit_mesh_measure_stats(ARegion *region,
DRW_text_cache_add(dt, vmid, numstr, numstr_len, 0, 0, txt_flag, col);
}
looptri_index += f_looptri_len;
}
}