diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2018-04-27 23:05:59 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2018-04-28 17:33:15 +0300 |
commit | c6fccbf842d8335dce156f608e631aca4a593100 (patch) | |
tree | 28dc8d5c77c56b21b73f0019e894814bea68ff89 /source/blender/editors/interface | |
parent | 54aa834b7d7cd60544e5e56c962f64bd48a3c400 (diff) |
UI: Remove deprecated drawing code
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index bd9b22c9a2f..bd6ee41a6de 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -913,17 +913,6 @@ static void shape_preset_init_scroll_circle(uiWidgetTrias *tria, const rcti *rec g_shape_preset_scroll_circle_face, ARRAY_SIZE(g_shape_preset_scroll_circle_face)); } -static void shape_preset_draw_trias_aa(uiWidgetTrias *tria, uint pos) -{ - for (int k = 0; k < WIDGET_AA_JITTER; k++) { - for (int i = 0; i < tria->tot; ++i) - for (int j = 0; j < 3; ++j) - immVertex2f(pos, - tria->vec[tria->index[i][j]][0] + jit[k][0], - tria->vec[tria->index[i][j]][1] + jit[k][1]); - } -} - static void widget_draw_vertex_buffer(unsigned int pos, unsigned int col, int mode, const float quads_pos[WIDGET_SIZE_MAX][2], const unsigned char quads_col[WIDGET_SIZE_MAX][4], @@ -1192,32 +1181,6 @@ static void widgetbase_draw(uiWidgetBase *wtb, uiWidgetColors *wcol) draw_widgetbase_batch(roundbox_batch, wtb); } - /* DEPRECATED: should be removed at some point. */ - if ((wtb->tria1.type == ROUNDBOX_TRIA_NONE) && - (wtb->tria1.tot || wtb->tria2.tot)) - { - const unsigned char tcol[4] = {wcol->item[0], - wcol->item[1], - wcol->item[2], - (unsigned char)((float)wcol->item[3] / WIDGET_AA_JITTER)}; - - unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT); - immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); - immUniformColor4ubv(tcol); - - /* for each AA step */ - immBegin(GWN_PRIM_TRIS, (wtb->tria1.tot + wtb->tria2.tot) * 3 * WIDGET_AA_JITTER); - if (wtb->tria1.tot) { - shape_preset_draw_trias_aa(&wtb->tria1, pos); - } - if (wtb->tria2.tot) { - shape_preset_draw_trias_aa(&wtb->tria2, pos); - } - immEnd(); - - immUnbindProgram(); - } - glDisable(GL_BLEND); } |