Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Erwin <significant.bit@gmail.com>2016-11-18 00:10:53 +0300
committerMike Erwin <significant.bit@gmail.com>2016-11-18 00:10:53 +0300
commitfe73b8c29cd2423350036c22d2b4fb5a0d363034 (patch)
treed31a170be0943a479772d46343fa8c6d00453d50 /source/blender/editors
parentd915e89ec888ff7ba1656f59bb38d14bc5fde793 (diff)
use new enum types in glutil & imm_util
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/screen/glutil.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c
index d719542e23a..47593252ecb 100644
--- a/source/blender/editors/screen/glutil.c
+++ b/source/blender/editors/screen/glutil.c
@@ -171,7 +171,7 @@ void glutil_draw_lined_arc(float start, float angle, float radius, int nsegments
glEnd();
}
-static void imm_draw_circle(GLenum prim_type, unsigned pos, float x, float y, float rad, int nsegments)
+static void imm_draw_circle(PrimitiveType prim_type, unsigned pos, float x, float y, float rad, int nsegments)
{
immBegin(prim_type, nsegments);
for (int i = 0; i < nsegments; ++i) {
@@ -184,17 +184,17 @@ static void imm_draw_circle(GLenum prim_type, unsigned pos, float x, float y, fl
void imm_draw_lined_circle(unsigned pos, float x, float y, float rad, int nsegments)
{
- imm_draw_circle(GL_LINE_LOOP, pos, x, y, rad, nsegments);
+ imm_draw_circle(PRIM_LINE_LOOP, pos, x, y, rad, nsegments);
}
void imm_draw_filled_circle(unsigned pos, float x, float y, float rad, int nsegments)
{
- imm_draw_circle(GL_TRIANGLE_FAN, pos, x, y, rad, nsegments);
+ imm_draw_circle(PRIM_TRIANGLE_FAN, pos, x, y, rad, nsegments);
}
void imm_draw_lined_circle_3D(unsigned pos, float x, float y, float rad, int nsegments)
{
- immBegin(GL_LINE_LOOP, nsegments);
+ immBegin(PRIM_LINE_LOOP, nsegments);
for (int i = 0; i < nsegments; ++i) {
float angle = 2 * M_PI * ((float)i / (float)nsegments);
immVertex3f(pos, x + rad * cosf(angle),
@@ -205,7 +205,7 @@ void imm_draw_lined_circle_3D(unsigned pos, float x, float y, float rad, int nse
void imm_draw_line_box(unsigned pos, float x1, float y1, float x2, float y2)
{
- immBegin(GL_LINE_LOOP, 4);
+ immBegin(PRIM_LINE_LOOP, 4);
immVertex2f(pos, x1, y1);
immVertex2f(pos, x1, y2);
immVertex2f(pos, x2, y2);
@@ -216,7 +216,7 @@ void imm_draw_line_box(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)
{
/* use this version when VertexFormat has a vec3 position */
- immBegin(GL_LINE_LOOP, 4);
+ immBegin(PRIM_LINE_LOOP, 4);
immVertex3f(pos, x1, y1, 0.0f);
immVertex3f(pos, x1, y2, 0.0f);
immVertex3f(pos, x2, y2, 0.0f);