Commit: 76ae10f580eb8cd460f4e69a500b8a65abc6f37a
Author: Luca Rood
Date: Tue Mar 7 01:40:40 2017 -0300
Branches: blender2.8
https://developer.blender.org/rB76ae10f580eb8cd460f4e69a500b8a65abc6f37a
OpenGL immediate mode: finish outliner_draw.c
Part of T49043
===================================================================
M source/blender/editors/space_outliner/outliner_draw.c
===================================================================
diff --git a/source/blender/editors/space_outliner/outliner_draw.c
b/source/blender/editors/space_outliner/outliner_draw.c
index e8d98d9f4d..0ba60b21aa 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -67,9 +67,6 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "BIF_gl.h"
-#include "BIF_glutil.h"
-
#include "GPU_immediate.h"
#include "UI_interface.h"
@@ -671,18 +668,22 @@ static void outliner_draw_rnacols(ARegion *ar, int sizex)
if (miny < v2d->tot.ymin) miny = v2d->tot.ymin;
glLineWidth(1.0f);
- UI_ThemeColorShadeAlpha(TH_BACK, -15, -200);
-
- /* draw column separator lines */
- fdrawline((float)sizex,
- v2d->cur.ymax,
- (float)sizex,
- miny);
-
- fdrawline((float)sizex + OL_RNA_COL_SIZEX,
- v2d->cur.ymax,
- (float)sizex + OL_RNA_COL_SIZEX,
- miny);
+
+ unsigned int pos = add_attrib(immVertexFormat(), "pos", COMP_F32, 2,
KEEP_FLOAT);
+ immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+ immUniformThemeColorShadeAlpha(TH_BACK, -15, -200);
+
+ immBegin(PRIM_LINES, 4);
+
+ immVertex2f(pos, sizex, v2d->cur.ymax);
+ immVertex2f(pos, sizex, miny);
+
+ immVertex2f(pos, sizex + OL_RNA_COL_SIZEX, v2d->cur.ymax);
+ immVertex2f(pos, sizex + OL_RNA_COL_SIZEX, miny);
+
+ immEnd();
+
+ immUnbindProgram();
}
static void outliner_draw_rnabuts(uiBlock *block, ARegion *ar, SpaceOops
*soops, int sizex, ListBase *lb)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
