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_clip/clip_draw.c | |
| 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_clip/clip_draw.c')
| -rw-r--r-- | source/blender/editors/space_clip/clip_draw.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c index f5680bf2265..fd716770218 100644 --- a/source/blender/editors/space_clip/clip_draw.c +++ b/source/blender/editors/space_clip/clip_draw.c @@ -316,7 +316,7 @@ static void draw_movieclip_buffer(const bContext *C, SpaceClip *sc, ARegion *ar, glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - imm_draw_checker_box(x, y, x + zoomx * ibuf->x, y + zoomy * ibuf->y); + imm_draw_checker_box_2d(x, y, x + zoomx * ibuf->x, y + zoomy * ibuf->y); } /* non-scaled proxy shouldn't use filtering */ @@ -372,7 +372,7 @@ static void draw_stabilization_border(SpaceClip *sc, ARegion *ar, int width, int immUniform1f("dash_width", 6.0f); immUniform1f("dash_factor", 0.5f); - imm_draw_line_box(shdr_pos, 0.0f, 0.0f, width, height); + imm_draw_line_box_2d(shdr_pos, 0.0f, 0.0f, width, height); immUnbindProgram(); @@ -618,7 +618,7 @@ static void draw_marker_outline(SpaceClip *sc, MovieTrackingTrack *track, MovieT ((marker->flag & MARKER_DISABLED) == 0 || (sc->flag & SC_SHOW_MARKER_PATTERN) == 0)) != 0; if (sc->flag & SC_SHOW_MARKER_SEARCH && show_search) { - imm_draw_line_box(position, marker->search_min[0], + imm_draw_line_box_2d(position, marker->search_min[0], marker->search_min[1], marker->search_max[0], marker->search_max[1]); @@ -795,7 +795,7 @@ static void draw_marker_areas(SpaceClip *sc, MovieTrackingTrack *track, MovieTra ((marker->flag & MARKER_DISABLED) == 0 || (sc->flag & SC_SHOW_MARKER_PATTERN) == 0)) != 0; if ((track->search_flag & SELECT) == sel && (sc->flag & SC_SHOW_MARKER_SEARCH) && show_search) { - imm_draw_line_box(shdr_pos, marker->search_min[0], marker->search_min[1], + imm_draw_line_box_2d(shdr_pos, marker->search_min[0], marker->search_min[1], marker->search_max[0], marker->search_max[1]); } |