Merge remote-tracking branch 'jdreaver/develop' into develop

2014-10-25 16:05:26 -04:00 · 2014-10-25 16:05:26 -04:00 · b5955faaa2
parent 021addcf0e 8f273f53ab
commit b5955faaa2
1 changed files with 2 additions and 1 deletions
--- a/pyqtgraph/opengl/items/GLScatterPlotItem.py
+++ b/pyqtgraph/opengl/items/GLScatterPlotItem.py
@ -66,7 +66,8 @@ class GLScatterPlotItem(GLGraphicsItem):
        #print pData.shape, pData.min(), pData.max()
        pData = pData.astype(np.ubyte)
        
-        self.pointTexture = glGenTextures(1)
+        if getattr(self, "pointTexture", None) is None:
+            self.pointTexture = glGenTextures(1)
        glActiveTexture(GL_TEXTURE0)
        glEnable(GL_TEXTURE_2D)
        glBindTexture(GL_TEXTURE_2D, self.pointTexture)