diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-09-26 08:21:01 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-26 08:21:01 +0300 |
| commit | 63dfb5bb97b1a320a0f5e51eaca51d7b25902aa4 (patch) | |
| tree | c378ff70a431d4954c7e842af46a5642194efd23 /source/blender/editors/interface | |
| parent | 86b81d25ea1ed696adc82ec39088e24f7a6422f0 (diff) | |
Cleanup: naming (GPU immediate util)
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_draw.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index 25a7fbd09ef..0cb8b9211ae 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -604,7 +604,7 @@ void UI_draw_safe_areas( float maxx = x2 - margin_x; float maxy = y2 - margin_y; - imm_draw_line_box_2d(pos, minx, miny, maxx, maxy); + imm_draw_box_wire_2d(pos, minx, miny, maxx, maxy); } } } @@ -1377,7 +1377,7 @@ void ui_draw_but_COLORBAND(uiBut *but, uiWidgetColors *UNUSED(wcol), const rcti /* layer: box outline */ immUniformColor4f(0.0f, 0.0f, 0.0f, 1.0f); - imm_draw_line_box_2d(position, x1, y1, x1 + sizex, rect->ymax); + imm_draw_box_wire_2d(position, x1, y1, x1 + sizex, rect->ymax); /* layer: box outline */ glEnable(GL_BLEND); @@ -1717,7 +1717,7 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, const rcti immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); immUniformColor3ubv((unsigned char *)wcol->outline); - imm_draw_line_box_2d(pos, rect->xmin, rect->ymin, rect->xmax, rect->ymax); + imm_draw_box_wire_2d(pos, rect->xmin, rect->ymin, rect->xmax, rect->ymax); immUnbindProgram(); } diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 74ea8c60427..e3977219eda 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -2637,7 +2637,7 @@ static void ui_draw_but_HSVCUBE(uiBut *but, const rcti *rect) unsigned int pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT); immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); immUniformColor3ub(0, 0, 0); - imm_draw_line_box_2d(pos, (rect->xmin), (rect->ymin), (rect->xmax), (rect->ymax)); + imm_draw_box_wire_2d(pos, (rect->xmin), (rect->ymin), (rect->xmax), (rect->ymax)); immUnbindProgram(); } |