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/gpencil | |
| 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/gpencil')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_brush.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c index ea21aa81d3d..1cee8db792a 100644 --- a/source/blender/editors/gpencil/gpencil_brush.c +++ b/source/blender/editors/gpencil/gpencil_brush.c @@ -991,11 +991,11 @@ static void gp_brush_drawcursor(bContext *C, int x, int y, void *UNUSED(customda /* Inner Ring: Light color for action of the brush */ /* TODO: toggle between add and remove? */ immUniformColor4ub(255, 255, 255, 200); - imm_draw_circle_wire(pos, x, y, brush->size, 40); + imm_draw_circle_wire_2d(pos, x, y, brush->size, 40); /* Outer Ring: Dark color for contrast on light backgrounds (e.g. gray on white) */ immUniformColor3ub(30, 30, 30); - imm_draw_circle_wire(pos, x, y, brush->size + 1, 40); + imm_draw_circle_wire_2d(pos, x, y, brush->size + 1, 40); immUnbindProgram(); diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index ffad8da84ff..e0751985bcd 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -1865,7 +1865,7 @@ static void gpencil_draw_eraser(bContext *UNUSED(C), int x, int y, void *p_ptr) glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); immUniformColor4ub(255, 100, 100, 20); - imm_draw_circle_fill(shdr_pos, x, y, p->radius, 40); + imm_draw_circle_fill_2d(shdr_pos, x, y, p->radius, 40); immUnbindProgram(); @@ -1880,7 +1880,7 @@ static void gpencil_draw_eraser(bContext *UNUSED(C), int x, int y, void *p_ptr) immUniform1f("dash_width", 12.0f); immUniform1f("dash_factor", 0.5f); - imm_draw_circle_wire(shdr_pos, x, y, p->radius, + imm_draw_circle_wire_2d(shdr_pos, x, y, p->radius, /* XXX Dashed shader gives bad results with sets of small segments currently, * temp hack around the issue. :( */ max_ii(8, p->radius / 2)); /* was fixed 40 */ |