diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-09-13 17:39:28 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-13 18:24:50 +0300 |
commit | 6d359e4498848d795b8043e923850d0a0da7f4ed (patch) | |
tree | d46262708081379039f41d7c33f14028d4ef84de /source/blender/editors/screen | |
parent | 2a01fb61f8402b31b9f85039e28acf310b1da332 (diff) |
Cleanup: use explicit 2d suffix for imm utils
Avoid ambiguity between 2d/3d (which were already named).
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r-- | source/blender/editors/screen/area.c | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/screendump.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 5eb51667988..8fa6a363230 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -228,7 +228,7 @@ static void area_draw_azone_fullscreen(short x1, short y1, short x2, short y2, f immAttrib4ub(color, 255, 0, 0, alpha_debug); immBindBuiltinProgram(GPU_SHADER_2D_FLAT_COLOR); - imm_draw_line_box(pos, click_rect.xmin, click_rect.ymin, click_rect.xmax, click_rect.ymax); + imm_draw_line_box_2d(pos, click_rect.xmin, click_rect.ymin, click_rect.xmax, click_rect.ymax); immAttrib4ub(color, 0, 255, 255, alpha_debug); immBegin(GWN_PRIM_LINES, 4); diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c index 6fa8905293c..69891a727d4 100644 --- a/source/blender/editors/screen/screendump.c +++ b/source/blender/editors/screen/screendump.c @@ -462,10 +462,10 @@ static void screencast_draw_cursor(bContext *UNUSED(C), int x, int y, void *UNUS immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); immUniformColor4ub(0, 0, 0, 32); - imm_draw_circle_fill(pos, (float)x, (float)y, 20, 40); + imm_draw_circle_fill_2d(pos, (float)x, (float)y, 20, 40); immUniformColor4ub(255, 255, 255, 128); - imm_draw_circle_wire(pos, (float)x, (float)y, 20, 40); + imm_draw_circle_wire_2d(pos, (float)x, (float)y, 20, 40); immUnbindProgram(); |