diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2017-04-07 22:51:39 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2017-04-07 22:51:39 +0300 |
| commit | 1ad52872604efb0a11011bcc7cd198c56ea97163 (patch) | |
| tree | 1fb2d6239c874c7f2b682f0f1c0ddbce10b5865c /source/blender/windowmanager/manipulators | |
| parent | da24848fb45695365aaf79e577ee241a97188eb5 (diff) | |
use COMP instead of GL enum to construct vertex format
I converted all other files a day or two ago; this file was part of a recent merge.
Diffstat (limited to 'source/blender/windowmanager/manipulators')
| -rw-r--r-- | source/blender/windowmanager/manipulators/intern/manipulator_library/dial_manipulator.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/windowmanager/manipulators/intern/manipulator_library/dial_manipulator.c b/source/blender/windowmanager/manipulators/intern/manipulator_library/dial_manipulator.c index 844de194845..63b02cb1509 100644 --- a/source/blender/windowmanager/manipulators/intern/manipulator_library/dial_manipulator.c +++ b/source/blender/windowmanager/manipulators/intern/manipulator_library/dial_manipulator.c @@ -102,7 +102,7 @@ static void dial_geom_draw( glLineWidth(dial->manipulator.line_width); VertexFormat *format = immVertexFormat(); - unsigned int pos = VertexFormat_add_attrib(format, "pos", GL_FLOAT, 2, KEEP_FLOAT); + unsigned int pos = VertexFormat_add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT); if (clip_plane) { immBindBuiltinProgram(GPU_SHADER_3D_CLIPPED_UNIFORM_COLOR); @@ -139,7 +139,7 @@ static void dial_ghostarc_draw_helpline(const float angle, const float co_outer[ gpuPushMatrix(); gpuRotate3f(RAD2DEGF(angle), 0.0f, 0.0f, -1.0f); - unsigned int pos = VertexFormat_add_attrib(immVertexFormat(), "pos", GL_FLOAT, 3, KEEP_FLOAT); + unsigned int pos = VertexFormat_add_attrib(immVertexFormat(), "pos", COMP_F32, 3, KEEP_FLOAT); immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR); @@ -161,7 +161,7 @@ static void dial_ghostarc_draw( const float width_inner = DIAL_WIDTH - dial->manipulator.line_width * 0.5f / U.manipulator_scale; VertexFormat *format = immVertexFormat(); - unsigned int pos = VertexFormat_add_attrib(format, "pos", GL_FLOAT, 2, KEEP_FLOAT); + unsigned int pos = VertexFormat_add_attrib(format, "pos", COMP_F32, 2, KEEP_FLOAT); immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR); immUniformColor4fv(color); imm_draw_disk_partial_fill( |