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/manipulator_library | |
| 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/manipulator_library')
| -rw-r--r-- | source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c index f637b098cca..0769d128b4d 100644 --- a/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c +++ b/source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c @@ -140,10 +140,10 @@ static void dial_geom_draw( immUniformColor4fv(color); if (filled) { - imm_draw_circle_fill(pos, 0, 0, 1.0, DIAL_RESOLUTION); + imm_draw_circle_fill_2d(pos, 0, 0, 1.0, DIAL_RESOLUTION); } else { - imm_draw_circle_wire(pos, 0, 0, 1.0, DIAL_RESOLUTION); + imm_draw_circle_wire_2d(pos, 0, 0, 1.0, DIAL_RESOLUTION); } immUnbindProgram(); @@ -187,7 +187,7 @@ static void dial_ghostarc_draw( uint pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT); immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR); immUniformColor4fv(color); - imm_draw_disk_partial_fill( + imm_draw_disk_partial_fill_2d( pos, 0, 0, 0.0, width_inner, DIAL_RESOLUTION, RAD2DEGF(angle_ofs), RAD2DEGF(angle_delta)); immUnbindProgram(); } diff --git a/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c index fd1f5a0cf25..5353104a1fd 100644 --- a/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c +++ b/source/blender/editors/manipulator_library/manipulator_types/grab3d_manipulator.c @@ -115,10 +115,10 @@ static void grab_geom_draw( if (draw_style == ED_MANIPULATOR_GRAB_STYLE_RING_2D) { if (filled) { - imm_draw_circle_fill(pos, 0, 0, 1.0f, DIAL_RESOLUTION); + imm_draw_circle_fill_2d(pos, 0, 0, 1.0f, DIAL_RESOLUTION); } else { - imm_draw_circle_wire(pos, 0, 0, 1.0f, DIAL_RESOLUTION); + imm_draw_circle_wire_2d(pos, 0, 0, 1.0f, DIAL_RESOLUTION); } } else if (draw_style == ED_MANIPULATOR_GRAB_STYLE_CROSS_2D) { |