blender
/
blender
134
400
Fork 584
Code Issues 6.3k Pull Requests 760 Projects 19 Wiki Activity

Fix T63886 Crash in UV Editing after faces display turn off / on 

This patch also improve cache locality of the IBO filling. I did not benchmark if it made
any difference.
This commit is contained in:
Clément Foucault 2019-04-26 17:03:25 +02:00
parent fe7605b710
commit 8192bcd7c1
Notes: blender-bot 2023-02-14 06:54:28 +01:00 
Referenced by issue #63886, Crash in UV Editing after faces display turn off / on
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4594,11 +4594,21 @@ static void uvedit_fill_buffer_data(MeshRenderData *rdata,
}
/* Skip hidden faces. */
if (elb_face && face_visible) {
for (i = 0; i < efa->len; ++i) {
GPU_indexbuf_add_generic_vert(elb_face, vidx + i);
GPU_indexbuf_add_generic_vert(elb_vert, vidx + i);
GPU_indexbuf_add_line_verts(elb_edge, vidx + i, vidx + (i + 1) % efa->len);
if (face_visible) {
if (elb_face) {
for (i = 0; i < efa->len; ++i) {
GPU_indexbuf_add_generic_vert(elb_face, vidx + i);
}
}
if (elb_vert) {
for (i = 0; i < efa->len; ++i) {
GPU_indexbuf_add_generic_vert(elb_vert, vidx + i);
}
}
if (elb_edge) {
for (i = 0; i < efa->len; ++i) {
GPU_indexbuf_add_line_verts(elb_edge, vidx + i, vidx + (i + 1) % efa->len);
}
}
}
@ -4662,18 +4672,24 @@ static void uvedit_fill_buffer_data(MeshRenderData *rdata,
GPU_vertbuf_attr_set(vbo_fdots_data, uv_attr_id.fdots_flag, fdot_idx, &face_flag);
}
/* Skip hidden faces. */
if (elb_face && face_visible) {
for (i = 0; i < mpoly->totloop; ++i) {
GPU_indexbuf_add_generic_vert(elb_face, vidx + i);
if (e_origindex[l[i].e] != ORIGINDEX_NONE) {
if (face_visible) {
if (elb_face) {
for (i = 0; i < mpoly->totloop; ++i) {
GPU_indexbuf_add_generic_vert(elb_face, vidx + i);
}
GPU_indexbuf_add_generic_vert(elb_face, vidx);
GPU_indexbuf_add_primitive_restart(elb_face);
}
if (elb_edge && e_origindex[l[i].e] != ORIGINDEX_NONE) {
for (i = 0; i < mpoly->totloop; ++i) {
GPU_indexbuf_add_line_verts(elb_edge, vidx + i, vidx + (i + 1) % mpoly->totloop);
}
if (v_origindex[l[i].v] != ORIGINDEX_NONE) {
}
if (elb_vert && v_origindex[l[i].v] != ORIGINDEX_NONE) {
for (i = 0; i < mpoly->totloop; ++i) {
GPU_indexbuf_add_generic_vert(elb_vert, vidx + i);
}
}
GPU_indexbuf_add_generic_vert(elb_face, vidx);
GPU_indexbuf_add_primitive_restart(elb_face);
}
for (i = 0; i < mpoly->totloop; i++, l++) {
/* TODO support stretch. */