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/windowmanager | |
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/windowmanager')
-rw-r--r-- | source/blender/windowmanager/intern/wm_gesture.c | 6 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 8 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_playanim.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/windowmanager/intern/wm_gesture.c b/source/blender/windowmanager/intern/wm_gesture.c index 73694295fef..486d3397c7e 100644 --- a/source/blender/windowmanager/intern/wm_gesture.c +++ b/source/blender/windowmanager/intern/wm_gesture.c @@ -224,7 +224,7 @@ static void wm_gesture_draw_rect(wmGesture *gt) immUniformArray4fv("colors", (float *)(float[][4]){{0.4f, 0.4f, 0.4f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, 2); immUniform1f("dash_width", 8.0f); - imm_draw_line_box(shdr_pos, (float)rect->xmin, (float)rect->ymin, (float)rect->xmax, (float)rect->ymax); + imm_draw_line_box_2d(shdr_pos, (float)rect->xmin, (float)rect->ymin, (float)rect->xmax, (float)rect->ymax); immUnbindProgram(); @@ -242,7 +242,7 @@ static void wm_gesture_draw_circle(wmGesture *gt) immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); immUniformColor4f(1.0f, 1.0f, 1.0f, 0.05f); - imm_draw_circle_fill(shdr_pos, (float)rect->xmin, (float)rect->ymin, (float)rect->xmax, 40); + imm_draw_circle_fill_2d(shdr_pos, (float)rect->xmin, (float)rect->ymin, (float)rect->xmax, 40); immUnbindProgram(); @@ -258,7 +258,7 @@ static void wm_gesture_draw_circle(wmGesture *gt) immUniformArray4fv("colors", (float *)(float[][4]){{0.4f, 0.4f, 0.4f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, 2); immUniform1f("dash_width", 4.0f); - imm_draw_circle_wire(shdr_pos, (float)rect->xmin, (float)rect->ymin, (float)rect->xmax, 40); + imm_draw_circle_wire_2d(shdr_pos, (float)rect->xmin, (float)rect->ymin, (float)rect->xmax, 40); immUnbindProgram(); } diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index c1a24bd35b9..d8df198ecbb 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -3184,7 +3184,7 @@ static void radial_control_paint_tex(RadialControl *rc, float radius, float alph /* flat color if no texture available */ immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR); immUniformColor3fvAlpha(col, alpha); - imm_draw_circle_fill(pos, 0.0f, 0.0f, radius, 40); + imm_draw_circle_fill_2d(pos, 0.0f, 0.0f, radius, 40); } immUnbindProgram(); @@ -3291,10 +3291,10 @@ static void radial_control_paint_cursor(bContext *C, int x, int y, void *customd } /* draw circles on top */ - imm_draw_circle_wire(pos, 0.0f, 0.0f, r1, 40); - imm_draw_circle_wire(pos, 0.0f, 0.0f, r2, 40); + imm_draw_circle_wire_2d(pos, 0.0f, 0.0f, r1, 40); + imm_draw_circle_wire_2d(pos, 0.0f, 0.0f, r2, 40); if (rmin > 0.0f) - imm_draw_circle_wire(pos, 0.0, 0.0f, rmin, 40); + imm_draw_circle_wire_2d(pos, 0.0, 0.0f, rmin, 40); immUnbindProgram(); BLF_size(fontid, 1.5 * fstyle_points * U.pixelsize, U.dpi); diff --git a/source/blender/windowmanager/intern/wm_playanim.c b/source/blender/windowmanager/intern/wm_playanim.c index 2c766efc6a2..00237f2809b 100644 --- a/source/blender/windowmanager/intern/wm_playanim.c +++ b/source/blender/windowmanager/intern/wm_playanim.c @@ -319,7 +319,7 @@ static void playanim_toscreen(PlayState *ps, PlayAnimPict *picture, struct ImBuf glEnable(GL_BLEND); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - imm_draw_checker_box(offs_x, offs_y, offs_x + span_x, offs_y + span_y); + imm_draw_checker_box_2d(offs_x, offs_y, offs_x + span_x, offs_y + span_y); } IMMDrawPixelsTexState state = immDrawPixelsTexSetup(GPU_SHADER_2D_IMAGE_COLOR); |