diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2017-03-03 21:22:16 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2017-03-03 21:22:16 +0300 |
| commit | 6999e8269334e2eee306f11c9e32c28f8d1c8cdc (patch) | |
| tree | 9f79417b8be7f33825a9061bbb33a4edbed73f30 /source/blender/editors | |
| parent | b3a4b61a3b55406d80867cfd41a363d27afed958 (diff) | |
OpenGL: remove last uses of fdrawbox
Part of T49043
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_draw.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_draw.c | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index 71d16328374..65a9a4ea13f 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -482,9 +482,6 @@ void ui_draw_but_IMAGE(ARegion *UNUSED(ar), uiBut *but, uiWidgetColors *UNUSED(w /* scissor doesn't seem to be doing the right thing...? */ #if 0 - //glColor4f(1.0, 0.f, 0.f, 1.f); - //fdrawbox(rect->xmin, rect->ymin, rect->xmax, rect->ymax) - /* prevent drawing outside widget area */ GLint scissor[4]; glGetIntegerv(GL_SCISSOR_BOX, scissor); diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index f78087c4b51..dd3938d39e8 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -711,8 +711,11 @@ static void node_draw_preview(bNodePreview *preview, rctf *prv) glDisable(GL_BLEND); - UI_ThemeColorShadeAlpha(TH_BACK, -15, +100); - fdrawbox(draw_rect.xmin, draw_rect.ymin, draw_rect.xmax, draw_rect.ymax); + unsigned int pos = add_attrib(immVertexFormat(), "pos", COMP_F32, 2, KEEP_FLOAT); + immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); + immUniformThemeColorShadeAlpha(TH_BACK, -15, +100); + imm_draw_line_box(pos, draw_rect.xmin, draw_rect.ymin, draw_rect.xmax, draw_rect.ymax); + immUnbindProgram(); } /* common handle function for operator buttons that need to select the node first */ |