Merge branch 'master' of github.com:/worklist/interface

This commit is contained in:
Philip Rosedale 2012-11-12 17:32:42 -08:00
commit ee0c614482

View file

@ -579,6 +579,8 @@ void display(void)
/* Draw Point Sprites */
load_png_as_texture(texture_filename);
//glActiveTexture(GL_TEXTURE0);
glEnable( GL_TEXTURE_2D );