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-02-28 11:09:44 +0300
committerMike Erwin <significant.bit@gmail.com>2017-02-28 11:09:44 +0300
commit6a3dd21eddcfc6e4352e0246d889f0eee6dfb44a (patch)
tree452d001d1fac1b52220682fa16081643be371c37
parent8a76049e84c79c6267c3c51fe32145f0ebf7805c (diff)
OpenGL: remove obsolete GL_POINT_SMOOTH
Was only used in one place, to show the 3D mouse rotation center.
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 325c81a3fd2..a9af383ee10 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1676,8 +1676,6 @@ static void draw_rotation_guide(RegionView3D *rv3d)
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
- glPointSize(5.0f);
- glEnable(GL_POINT_SMOOTH);
glDepthMask(GL_FALSE); /* don't overwrite zbuf */
VertexFormat *format = immVertexFormat();
@@ -1756,7 +1754,11 @@ static void draw_rotation_guide(RegionView3D *rv3d)
else
color[3] = 127; /* see-through dot */
+ immUnbindProgram();
+
/* -- draw rotation center -- */
+ immBindBuiltinProgram(GPU_SHADER_3D_POINT_FIXED_SIZE_VARYING_COLOR);
+ glPointSize(5.0f);
immBegin(GL_POINTS, 1);
immAttrib4ubv(col, color);
immVertex3fv(pos, o);
@@ -1771,7 +1773,6 @@ static void draw_rotation_guide(RegionView3D *rv3d)
#endif
glDisable(GL_BLEND);
- glDisable(GL_POINT_SMOOTH);
glDepthMask(GL_TRUE);
}
#endif /* WITH_INPUT_NDOF */