Merge branch 'master' of github.com:nodebox/nodebox-opengl

Conflicts:
	setup.py

Author: Tom De Smedt

.gitignore

@@ -15,3 +15,4 @@ Thumbs.db
 
 # Temporary editor files
 *.swp
+.idea

nodebox/graphics/geometry.py

@@ -449,10 +449,10 @@ def __repr__(self):
 #  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from sys import platform
-from ctypes import CFUNCTYPE, POINTER, byref, cast
+from ctypes import CFUNCTYPE, POINTER, byref, cast, pointer
 from ctypes import CFUNCTYPE as _CFUNCTYPE
 from pyglet.gl import \
-    GLdouble, GLvoid, GLenum, GLfloat, pointer, \
+    GLdouble, GLvoid, GLenum, GLfloat, \
     gluNewTess, gluTessProperty, gluTessNormal, gluTessCallback, gluTessVertex, \
     gluTessBeginPolygon, gluTessEndPolygon, \
     gluTessBeginContour, gluTessEndContour, \

nodebox/graphics/shader.py

@@ -1,4 +1,4 @@
-#=== SHADER ==========================================================================================
+
 # Fragment shaders, filters, Frame Buffer Object (FBO)
 # Authors: Tom De Smedt, Frederik De Bleser
 # License: BSD (see LICENSE.txt for details).
@@ -10,6 +10,8 @@
 from context      import Image, texture
 from geometry     import lerp, clamp
 from math         import radians
+from ctypes       import byref, cast, pointer, POINTER
+from ctypes       import c_char, c_char_p, c_uint, c_int
 
 def next(generator, default=None):
     try: