[Bf-blender-cvs] [ec86bebb87a] blender2.8: UV Editor: Style: rename variables to match others.
Germano
noreply at git.blender.org
Thu Apr 19 16:24:18 CEST 2018
Commit: ec86bebb87ae7a148e27b6e8d7bdbdd3d7358820
Author: Germano
Date: Thu Apr 19 11:20:13 2018 -0300
Branches: blender2.8
https://developer.blender.org/rBec86bebb87ae7a148e27b6e8d7bdbdd3d7358820
UV Editor: Style: rename variables to match others.
===================================================================
M source/blender/editors/uvedit/uvedit_draw.c
===================================================================
diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index eaedb99778c..2bfde68bf9f 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -390,7 +390,7 @@ static void draw_uvs_lineloop_bmfaces(BMesh *bm, const int cd_loop_uv_offset, co
MLoopUV *luv;
/* For more efficiency first transfer the entire buffer to vram. */
- Gwn_Batch *uv_batch = immBeginBatchAtMost(GWN_PRIM_LINE_LOOP, bm->totloop);
+ Gwn_Batch *loop_batch = immBeginBatchAtMost(GWN_PRIM_LINE_LOOP, bm->totloop);
BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
@@ -404,19 +404,19 @@ static void draw_uvs_lineloop_bmfaces(BMesh *bm, const int cd_loop_uv_offset, co
immEnd();
/* Then draw each face contour separately. */
- GWN_batch_program_use_begin(uv_batch);
+ GWN_batch_program_use_begin(loop_batch);
unsigned int index = 0;
BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
continue;
- GWN_batch_draw_range_ex(uv_batch, index, efa->len, false);
+ GWN_batch_draw_range_ex(loop_batch, index, efa->len, false);
index += efa->len;
}
- GWN_batch_program_use_end(uv_batch);
+ GWN_batch_program_use_end(loop_batch);
- GWN_vertbuf_discard(uv_batch->verts[0]);
- GWN_batch_discard(uv_batch);
+ GWN_vertbuf_discard(loop_batch->verts[0]);
+ GWN_batch_discard(loop_batch);
immUnbindProgram();
@@ -743,7 +743,6 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, ViewLayer *view_layer, Obje
/* XXX performance: we should not create and throw away result. */
GWN_batch_draw(face_batch);
GWN_batch_program_use_end(face_batch);
- GWN_vertbuf_discard(face_batch->verts[0]);
GWN_batch_discard(face_batch);
immUnbindProgram();
@@ -807,8 +806,8 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, ViewLayer *view_layer, Obje
}
/* For more efficiency first transfer the entire buffer to vram. */
- Gwn_Batch *uv_batch = immBeginBatchAtMost(GWN_PRIM_LINE_LOOP, bm->totloop);
- Gwn_VertBuf* uv_vbo = uv_batch->verts[0];
+ Gwn_Batch *loop_batch = immBeginBatchAtMost(GWN_PRIM_LINE_LOOP, bm->totloop);
+ Gwn_VertBuf* loop_vbo = loop_batch->verts[0];
BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
continue;
@@ -821,18 +820,18 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, ViewLayer *view_layer, Obje
immEnd();
/* Then draw each face contour separately. */
- if (uv_vbo->vertex_ct != 0) {
- GWN_batch_program_use_begin(uv_batch);
- unsigned int index = 0, vbo_len_used;
+ if (loop_vbo->vertex_ct != 0) {
+ GWN_batch_program_use_begin(loop_batch);
+ unsigned int index = 0, loop_vbo_count;
BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
continue;
- GWN_batch_draw_range_ex(uv_batch, index, efa->len, false);
+ GWN_batch_draw_range_ex(loop_batch, index, efa->len, false);
index += efa->len;
}
- vbo_len_used = index;
- GWN_batch_program_use_end(uv_batch);
+ loop_vbo_count = index;
+ GWN_batch_program_use_end(loop_batch);
immUnbindProgram();
@@ -853,7 +852,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, ViewLayer *view_layer, Obje
}
Gwn_VertBuf *vbo_col = GWN_vertbuf_create_with_format(&format);
- GWN_vertbuf_data_alloc(vbo_col, vbo_len_used);
+ GWN_vertbuf_data_alloc(vbo_col, loop_vbo_count);
index = 0;
BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
@@ -866,22 +865,22 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, ViewLayer *view_layer, Obje
}
}
/* Reuse the UV buffer and add the color buffer. */
- GWN_batch_vertbuf_add_ex(uv_batch, vbo_col, true);
+ GWN_batch_vertbuf_add_ex(loop_batch, vbo_col, true);
/* Now draw each face contour separately with another builtin program. */
- GWN_batch_program_set_builtin(uv_batch, GPU_SHADER_2D_SMOOTH_COLOR);
- gpuBindMatrices(uv_batch->interface);
+ GWN_batch_program_set_builtin(loop_batch, GPU_SHADER_2D_SMOOTH_COLOR);
+ gpuBindMatrices(loop_batch->interface);
- GWN_batch_program_use_begin(uv_batch);
+ GWN_batch_program_use_begin(loop_batch);
index = 0;
BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
continue;
- GWN_batch_draw_range_ex(uv_batch, index, efa->len, false);
+ GWN_batch_draw_range_ex(loop_batch, index, efa->len, false);
index += efa->len;
}
- GWN_batch_program_use_end(uv_batch);
+ GWN_batch_program_use_end(loop_batch);
}
else {
Gwn_VertFormat *format = immVertexFormat();
@@ -891,7 +890,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, ViewLayer *view_layer, Obje
immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR);
/* Use batch here to avoid problems with `IMM_BUFFER_SIZE`. */
- Gwn_Batch *flat_edges_batch = immBeginBatchAtMost(GWN_PRIM_LINES, vbo_len_used * 2);
+ Gwn_Batch *flat_edges_batch = immBeginBatchAtMost(GWN_PRIM_LINES, loop_vbo_count * 2);
BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
continue;
@@ -916,26 +915,26 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, ViewLayer *view_layer, Obje
}
}
else {
- GWN_batch_uniform_4fv(uv_batch, "color", col2);
+ GWN_batch_uniform_4fv(loop_batch, "color", col2);
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
/* no nice edges */
- GWN_batch_program_use_begin(uv_batch);
+ GWN_batch_program_use_begin(loop_batch);
index = 0;
BM_ITER_MESH(efa, &iter, bm, BM_FACES_OF_MESH) {
if (!BM_elem_flag_test(efa, BM_ELEM_TAG))
continue;
- GWN_batch_draw_range_ex(uv_batch, index, efa->len, false);
+ GWN_batch_draw_range_ex(loop_batch, index, efa->len, false);
index += efa->len;
}
- GWN_batch_program_use_end(uv_batch);
+ GWN_batch_program_use_end(loop_batch);
immUnbindProgram();
}
}
- GWN_vertbuf_discard(uv_vbo);
- GWN_batch_discard(uv_batch);
+ GWN_vertbuf_discard(loop_vbo);
+ GWN_batch_discard(loop_batch);
}
else {
immUnbindProgram();
More information about the Bf-blender-cvs
mailing list