Naming constancy for 'imm' utility functions

- use 'imm_draw_' prefix for functions that draw.
- use '_3d' suffix for 3d functions, no suffix for 2d functions.
- use terms fill/wire (shorter than filled / lined).

Also add `imm_draw_circle_fill_3d` (only had wire version)

1 files changed, 9 insertions, 7 deletions

diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h
index ebc6cd86479..7db32eb39a0 100644
--- a/source/blender/editors/include/BIF_glutil.h
+++ b/source/blender/editors/include/BIF_glutil.h
@@ -60,7 +60,8 @@ struct ColorManagedDisplaySettings;
 void imm_draw_lined_circle(unsigned pos, float x, float y, float radius, int nsegments);
 
 /* use this version when VertexFormat has a vec3 position */
-void imm_draw_lined_circle_3D(unsigned pos, float x, float y, float radius, int nsegments);
+void imm_draw_circle_wire_3d(unsigned pos, float x, float y, float radius, int nsegments);
+void imm_draw_circle_fill_3d(unsigned pos, float x, float y, float radius, int nsegments);
 
 /**
  * Draw a filled circle with the given \a radius.
@@ -72,7 +73,7 @@ void imm_draw_lined_circle_3D(unsigned pos, float x, float y, float radius, int
  * \param radius The circle's radius.
  * \param nsegments The number of segments to use in drawing (more = smoother).
  */
-void imm_draw_filled_circle(unsigned pos, float x, float y, float radius, int nsegments);
+void imm_draw_circle_fill(unsigned pos, float x, float y, float radius, int nsegments);
 
 /**
  * Draw a filled arc with the given inner and outer radius.
@@ -89,7 +90,7 @@ void imm_draw_filled_circle(unsigned pos, float x, float y, float radius, int ns
  * \param start: Specifies the starting angle, in degrees, of the disk portion.
  * \param sweep: Specifies the sweep angle, in degrees, of the disk portion.
  */
-void imm_draw_filled_disk_partial(
+void imm_draw_disk_partial_fill(
         unsigned pos, float x, float y,
         float radius_inner, float radius_outer, int nsegments, float start, float sweep);
 
@@ -105,7 +106,7 @@ void imm_draw_filled_disk_partial(
 void imm_draw_line_box(unsigned pos, float x1, float y1, float x2, float y2);
 
 /* use this version when VertexFormat has a vec3 position */
-void imm_draw_line_box_3D(unsigned pos, float x1, float y1, float x2, float y2);
+void imm_draw_line_box_3d(unsigned pos, float x1, float y1, float x2, float y2);
 
 /* Draw a standard checkerboard to indicate transparent backgrounds */
 void imm_draw_checker_box(float x1, float y1, float x2, float y2);
@@ -129,9 +130,10 @@ void imm_cpack(unsigned int x);
 * \param slices Specifies the number of subdivisions around the z axis.
 * \param stacks Specifies the number of subdivisions along the z axis.
 */
-void imm_cylinder_nor(unsigned int pos, unsigned int nor, float base, float top, float height, int slices, int stacks);
-void imm_cylinder_wire(unsigned int pos, float base, float top, float height, int slices, int stacks);
-void imm_cylinder(unsigned int pos, float base, float top, float height, int slices, int stacks);
+void imm_draw_cylinder_fill_normal_3d(
+        unsigned int pos, unsigned int nor, float base, float top, float height, int slices, int stacks);
+void imm_draw_cylinder_wire_3d(unsigned int pos, float base, float top, float height, int slices, int stacks);
+void imm_draw_cylinder_fill_3d(unsigned int pos, float base, float top, float height, int slices, int stacks);
 
 /**
  * Returns a float value as obtained by glGetFloatv.