[Bf-blender-cvs] [f2ea319316] blender2.8: OpenGL: outliner_draw_tree_element uses new imm mode

Cyrax noreply at git.blender.org
Thu Feb 9 00:38:18 CET 2017


Commit: f2ea319316f86042fceb1f097b889356cf9e26ea
Author: Cyrax
Date:   Wed Feb 8 18:35:56 2017 -0500
Branches: blender2.8
https://developer.blender.org/rBf2ea319316f86042fceb1f097b889356cf9e26ea

OpenGL:  outliner_draw_tree_element uses new imm mode

D2438 by @cyrax
review by @merwin
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 e442414990..6db1a513a0 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -1328,12 +1328,19 @@ static void outliner_draw_tree_element(
 					int tempx = startx + offsx;
 					
 					/* divider */
-					UI_ThemeColorShade(TH_BACK, -40);
-					glRecti(tempx   - 10.0f * ufac,
-					        *starty +  4.0f * ufac,
-					        tempx   -  8.0f * ufac,
-					        *starty + UI_UNIT_Y - 4.0f * ufac);
-					
+					{
+						VertexFormat *format = immVertexFormat();
+						unsigned pos = add_attrib(format, "pos", GL_INT, 2, CONVERT_INT_TO_FLOAT);
+						immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
+						unsigned char col[4];
+						UI_GetThemeColorShade4ubv(TH_BACK, -40, col);
+						immUniformColor4ubv(col);
+						immRecti(pos, tempx   - 10.0f * ufac,
+								*starty +  4.0f * ufac,
+								tempx   -  8.0f * ufac,
+								*starty + UI_UNIT_Y - 4.0f * ufac);
+						immUnbindProgram();
+					}
 					glEnable(GL_BLEND);
 					glPixelTransferf(GL_ALPHA_SCALE, 0.5);




More information about the Bf-blender-cvs mailing list