blender
/
blender
137
404
Fork 586
Code Issues 6.2k Pull Requests 760 Projects 19 Wiki Activity

immediate mode: use new ThemeColor functions

This commit is contained in:
Dalai Felinto 2016-10-12 23:18:14 +00:00
parent e79f302f16
commit 69b1b95356
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/space_time/space_time.c
View File

@ -101,11 +101,8 @@ static void time_draw_sfra_efra(Scene *scene, View2D *v2d)
glDisable(GL_BLEND);
/* thin lines where the actual frames are */
unsigned char color[3];
UI_GetThemeColorShade3ubv(TH_BACK, -60, color);
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
immUniformColor3ubv(color);
immUniformThemeColorShade(TH_BACK, -60);
immBegin(GL_LINES, 4);

4
source/blender/editors/space_view3d/view3d_fly.c
View File

@ -264,9 +264,7 @@ static void drawFlyPixel(const struct bContext *UNUSED(C), ARegion *UNUSED(ar),
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
unsigned char square_color[3];
UI_GetThemeColor3ubv(TH_VIEW_OVERLAY, square_color);
immUniformColor3ubv(square_color);
immUniformThemeColor(TH_VIEW_OVERLAY);
immBegin(GL_LINES, 16);

4
source/blender/editors/space_view3d/view3d_walk.c
View File

@ -345,9 +345,7 @@ static void drawWalkPixel(const struct bContext *UNUSED(C), ARegion *ar, void *a
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
unsigned char crosshair_color[3];
UI_GetThemeColor3ubv(TH_VIEW_OVERLAY, crosshair_color);
immUniformColor3ubv(crosshair_color);
immUniformThemeColor(TH_VIEW_OVERLAY);
immBegin(GL_LINES, 8);