griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OpenGL: remove last uses of fdrawbox

Browse Source 
Part of T49043
This commit is contained in:
Mike Erwin
2017-03-03 13:22:16 -05:00
parent b3a4b61a3b
commit 6999e82693
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/interface/interface_draw.c
View File

@@ -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);

7
source/blender/editors/space_node/node_draw.c
View File

@@ -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 */