[Bf-blender-cvs] [6999e82693] blender2.8: OpenGL: remove last uses of fdrawbox
Mike Erwin
noreply at git.blender.org
Fri Mar 3 19:27:29 CET 2017
Commit: 6999e8269334e2eee306f11c9e32c28f8d1c8cdc
Author: Mike Erwin
Date: Fri Mar 3 13:22:16 2017 -0500
Branches: blender2.8
https://developer.blender.org/rB6999e8269334e2eee306f11c9e32c28f8d1c8cdc
OpenGL: remove last uses of fdrawbox
Part of T49043
===================================================================
M source/blender/editors/interface/interface_draw.c
M source/blender/editors/space_node/node_draw.c
===================================================================
diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c
index 71d1632837..65a9a4ea13 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 f78087c4b5..dd3938d39e 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 */
More information about the Bf-blender-cvs
mailing list