[Bf-blender-cvs] [33e2cf2aab3] blender2.8: Cleanup: fill vertex buffer in order
Campbell Barton
noreply at git.blender.org
Fri Oct 12 07:43:01 CEST 2018
Commit: 33e2cf2aab35d65009b21f197aa2d1e2c81b0c6f
Author: Campbell Barton
Date: Fri Oct 12 16:25:16 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB33e2cf2aab35d65009b21f197aa2d1e2c81b0c6f
Cleanup: fill vertex buffer in order
===================================================================
M source/blender/draw/intern/draw_cache_impl_mesh.c
===================================================================
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c
index 2672e23bb7f..755d9e3bef1 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -1647,8 +1647,9 @@ static void add_overlay_tri(
if (vbo_data) {
fflag = mesh_render_data_looptri_flag(rdata, bm_looptri[0]->f);
- uint i_prev = 1, i = 2;
- for (uint i_next = 0; i_next < 3; i_next++) {
+ for (uint i = 0; i < 3; i++) {
+ const int i_next = (i + 1) % 3;
+ const int i_prev = (i + 2) % 3;
vflag = mesh_render_data_vertex_flag(rdata, bm_looptri[i]->v);
/* Opposite edge to the vertex at 'i'. */
EdgeDrawAttr eattr = {0};
@@ -1658,9 +1659,6 @@ static void add_overlay_tri(
}
eattr.v_flag = fflag | vflag;
GPU_vertbuf_attr_set(vbo_data, data_id, base_vert_idx + i, &eattr);
-
- i_prev = i;
- i = i_next;
}
}
}
@@ -1709,8 +1707,9 @@ static void add_overlay_tri_mapped(
if (vbo_data) {
fflag = mesh_render_data_looptri_flag(rdata, efa);
- uint i_prev = 1, i = 2;
- for (uint i_next = 0; i_next < 3; i_next++) {
+ for (uint i = 0; i < 3; i++) {
+ const int i_next = (i + 1) % 3;
+ const int i_prev = (i + 2) % 3;
const int v_orig = v_origindex[mloop[mlt->tri[i]].v];
if (v_orig != ORIGINDEX_NONE) {
BMVert *v = BM_vert_at_index(bm, v_orig);
@@ -1737,9 +1736,6 @@ static void add_overlay_tri_mapped(
}
eattr.v_flag = fflag | vflag;
GPU_vertbuf_attr_set(vbo_data, data_id, base_vert_idx + i, &eattr);
-
- i_prev = i;
- i = i_next;
}
}
}
More information about the Bf-blender-cvs
mailing list