Commit 1aeb197b authored by Luke Campagnola's avatar Luke Campagnola
Browse files

Merge pull request #102 from jdreaver/develop

Fix OpenGL shader/texture sharing on PySide
parents 88bf8880 70d9f1ee
......@@ -7,6 +7,8 @@ from .. import functions as fn
##Vector = QtGui.QVector3D
ShareWidget = None
class GLViewWidget(QtOpenGL.QGLWidget):
Basic widget for displaying 3D data
......@@ -16,14 +18,14 @@ class GLViewWidget(QtOpenGL.QGLWidget):
ShareWidget = None
def __init__(self, parent=None):
if GLViewWidget.ShareWidget is None:
global ShareWidget
if ShareWidget is None:
## create a dummy widget to allow sharing objects (textures, shaders, etc) between views
GLViewWidget.ShareWidget = QtOpenGL.QGLWidget()
ShareWidget = QtOpenGL.QGLWidget()
QtOpenGL.QGLWidget.__init__(self, parent, GLViewWidget.ShareWidget)
QtOpenGL.QGLWidget.__init__(self, parent, ShareWidget)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment