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/space_image | |
| 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/space_image')
| -rw-r--r-- | source/blender/editors/space_image/image_draw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c index 1af717fd7f8..fed1d3ce38c 100644 --- a/source/blender/editors/space_image/image_draw.c +++ b/source/blender/editors/space_image/image_draw.c @@ -369,7 +369,7 @@ void ED_image_draw_info(Scene *scene, ARegion *ar, bool color_manage, bool use_d pos = GWN_vertformat_attr_add(immVertexFormat(), "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT); immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); immUniformColor3ub(128, 128, 128); - imm_draw_line_box(pos, color_rect.xmin, color_rect.ymin, color_rect.xmax, color_rect.ymax); + imm_draw_line_box_2d(pos, color_rect.xmin, color_rect.ymin, color_rect.xmax, color_rect.ymax); immUnbindProgram(); dx += 1.75f * UI_UNIT_X; @@ -503,7 +503,7 @@ static void draw_image_buffer(const bContext *C, SpaceImage *sima, ARegion *ar, &clip_max_x, &clip_max_y); if (sima->flag & SI_USE_ALPHA) { - imm_draw_checker_box(x, y, x + ibuf->x * zoomx, y + ibuf->y * zoomy); + imm_draw_checker_box_2d(x, y, x + ibuf->x * zoomx, y + ibuf->y * zoomy); glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); |