Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2016-10-13 02:18:14 +0300
committerDalai Felinto <dfelinto@gmail.com>2016-10-13 03:36:56 +0300
commit69b1b95356dfb5491730878de2ab5093eb90e20a (patch)
tree15f28d2dd4f5fe9e6190885bee8452f6bfe15cda /source/blender/editors
parente79f302f1613adfb957c2f8f5fca50aba7f25259 (diff)
immediate mode: use new ThemeColor functions
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/space_time/space_time.c5
-rw-r--r--source/blender/editors/space_view3d/view3d_fly.c4
-rw-r--r--source/blender/editors/space_view3d/view3d_walk.c4
3 files changed, 3 insertions, 10 deletions
diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c
index 685f513c6e8..0b249bfae59 100644
--- a/source/blender/editors/space_time/space_time.c
+++ b/source/blender/editors/space_time/space_time.c
@@ -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);
diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c
index 19c4b80a005..b42afd3a7a9 100644
--- a/source/blender/editors/space_view3d/view3d_fly.c
+++ b/source/blender/editors/space_view3d/view3d_fly.c
@@ -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);
diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c
index 7a826c16e75..4131a5c33c7 100644
--- a/source/blender/editors/space_view3d/view3d_walk.c
+++ b/source/blender/editors/space_view3d/view3d_walk.c
@@ -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);