Cleanup: use explicit 2d suffix for imm utils

Avoid ambiguity between 2d/3d (which were already named).

4 files changed, 11 insertions, 11 deletions

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index ce206e9de0c..2fce8783aa2 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -768,7 +768,7 @@ static void draw_empty_image(Object *ob, const short dflag, const unsigned char
 			glDisable(GL_BLEND);
 		}
 
-		imm_draw_line_box(pos, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
+		imm_draw_line_box_2d(pos, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
 	}
 	else {
 		immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
@@ -780,7 +780,7 @@ static void draw_empty_image(Object *ob, const short dflag, const unsigned char
 			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 		}
 
-		imm_draw_line_box(pos, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
+		imm_draw_line_box_2d(pos, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
 
 		glDisable(GL_LINE_SMOOTH);
 		glDisable(GL_BLEND);
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 688bee4760b..9af0be79a42 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -504,12 +504,12 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d)
 		}
 
 		immUniformThemeColor(TH_BACK);
-		imm_draw_line_box(shdr_pos, x1i, y1i, x2i, y2i);
+		imm_draw_line_box_2d(shdr_pos, x1i, y1i, x2i, y2i);
 
 #ifdef VIEW3D_CAMERA_BORDER_HACK
 		if (view3d_camera_border_hack_test == true) {
 			immUniformColor3ubv(view3d_camera_border_hack_col);
-			imm_draw_line_box(shdr_pos, x1i + 1, y1i + 1, x2i - 1, y2i - 1);
+			imm_draw_line_box_2d(shdr_pos, x1i + 1, y1i + 1, x2i - 1, y2i - 1);
 			view3d_camera_border_hack_test = false;
 		}
 #endif
@@ -532,11 +532,11 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d)
 		/* outer line not to confuse with object selection */
 		if (v3d->flag2 & V3D_LOCK_CAMERA) {
 			immUniformThemeColor(TH_REDALERT);
-			imm_draw_line_box(shdr_pos, x1i - 1, y1i - 1, x2i + 1, y2i + 1);
+			imm_draw_line_box_2d(shdr_pos, x1i - 1, y1i - 1, x2i + 1, y2i + 1);
 		}
 
 		immUniformThemeColor(TH_VIEW_OVERLAY);
-		imm_draw_line_box(shdr_pos, x1i, y1i, x2i, y2i);
+		imm_draw_line_box_2d(shdr_pos, x1i, y1i, x2i, y2i);
 	}
 
 	/* border */
@@ -549,7 +549,7 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d)
 		y4 = floorf(y1 + (scene->r.border.ymax * (y2 - y1))) + (U.pixelsize - 1);
 
 		immUniformColor3f(1.0f, 0.25f, 0.25f);
-		imm_draw_line_box(shdr_pos, x3, y3, x4, y4);
+		imm_draw_line_box_2d(shdr_pos, x3, y3, x4, y4);
 	}
 
 	/* safety border */
@@ -658,7 +658,7 @@ static void drawviewborder(Scene *scene, ARegion *ar, View3D *v3d)
 			/* TODO Was using UI_draw_roundbox_4fv(false, rect.xmin, rect.ymin, rect.xmax, rect.ymax, 2.0f, color).
 			 * We'll probably need a new imm_draw_line_roundbox_dashed dor that - though in practice the
 			 * 2.0f round corner effect was nearly not visible anyway... */
-			imm_draw_line_box(shdr_pos, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
+			imm_draw_line_box_2d(shdr_pos, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
 		}
 	}
 
@@ -692,7 +692,7 @@ static void drawrenderborder(ARegion *ar, View3D *v3d)
 	immUniform1f("dash_width", 6.0f);
 	immUniform1f("dash_factor", 0.5f);
 
-	imm_draw_line_box(shdr_pos,
+	imm_draw_line_box_2d(shdr_pos,
 	                  v3d->render_border.xmin * ar->winx, v3d->render_border.ymin * ar->winy,
 	                  v3d->render_border.xmax * ar->winx, v3d->render_border.ymax * ar->winy);
 
diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c
index 73ffe949823..a9e4da67b65 100644
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@ -1891,7 +1891,7 @@ static bool view3d_main_region_draw_engine(
 	if (v3d->flag & V3D_DISPBGPICS)
 		view3d_draw_bgpic_test(scene, ar, v3d, false, true);
 	else
-		imm_draw_checker_box(0, 0, ar->winx, ar->winy);
+		imm_draw_checker_box_2d(0, 0, ar->winx, ar->winy);
 
 	/* render result draw */
 	type = rv3d->render_engine->type;
diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c
index 9aaa766be74..7b7d996c77e 100644
--- a/source/blender/editors/space_view3d/view3d_ruler.c
+++ b/source/blender/editors/space_view3d/view3d_ruler.c
@@ -704,7 +704,7 @@ static void ruler_info_draw_pixel(const struct bContext *C, ARegion *ar, void *a
 			immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
 			immUniformColor4fv(color_act);
 
-			imm_draw_circle_wire(pos, co_ss[0], co_ss[1], size * U.pixelsize, 32);
+			imm_draw_circle_wire_2d(pos, co_ss[0], co_ss[1], size * U.pixelsize, 32);
 
 			immUnbindProgram();
 		}