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>2017-04-08 07:50:36 +0300
committerMike Erwin <significant.bit@gmail.com>2017-04-08 08:19:48 +0300
commit0947c97fade7a5400e22d85b1f61c5a0f552976a (patch)
tree181186c3c31706c3e0c813b62990c9186e2fc6f6 /source/blender/windowmanager/manipulators
parent1de61696fd2ffc9d800a2eff964045b90c9f2347 (diff)
OpenGL: use PRIM instead of GL enum everywhere else
Well, everywhere that uses Gawain for drawing. Places that call OpenGL directly still use GL enums. Part of T49043
Diffstat (limited to 'source/blender/windowmanager/manipulators')
-rw-r--r--source/blender/windowmanager/manipulators/intern/wm_manipulator.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
index b11fad46286..de2096dbde9 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
@@ -79,7 +79,7 @@ void wm_manipulator_geometryinfo_draw(const ManipulatorGeomInfo *info, const boo
}
/* Elements */
- ElementListBuilder_init(&elb, GL_TRIANGLES, info->ntris, info->nverts);
+ ElementListBuilder_init(&elb, PRIM_TRIANGLES, info->ntris, info->nverts);
for (int i = 0; i < info->ntris; ++i) {
const unsigned short *idx = &info->indices[i * 3];
add_triangle_vertices(&elb, idx[0], idx[1], idx[2]);
@@ -96,7 +96,7 @@ void wm_manipulator_geometryinfo_draw(const ManipulatorGeomInfo *info, const boo
VertexBuffer_fill_attrib(vbo, nor_id, info->normals);
}
- batch = Batch_create(GL_TRIANGLES, vbo, el);
+ batch = Batch_create(PRIM_TRIANGLES, vbo, el);
Batch_set_builtin_program(batch, GPU_SHADER_3D_UNIFORM_COLOR);
Batch_Uniform4fv(batch, "color", color);