summaryrefslogtreecommitdiffstats
path: root/src/datavisualization/utils/surfaceobject.cpp
diff options
context:
space:
mode:
authorMika Salmela <mika.salmela@digia.com>2013-12-20 12:03:59 +0200
committerMika Salmela <mika.salmela@digia.com>2013-12-20 12:05:37 +0200
commiteb3d0514ca886db33776522ea00f27b69bc86ad1 (patch)
tree3439287f6a70f681c5c9a08c77ec1b4342a24768 /src/datavisualization/utils/surfaceobject.cpp
parent07aba602fc82ac31684988f8e8e22521d2b3c982 (diff)
parente895c5085f6097983bdd617c39ea5184541d6c4d (diff)
Merge branch 'develop'
Diffstat (limited to 'src/datavisualization/utils/surfaceobject.cpp')
-rw-r--r--src/datavisualization/utils/surfaceobject.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp
index 605376e2..6e4765e5 100644
--- a/src/datavisualization/utils/surfaceobject.cpp
+++ b/src/datavisualization/utils/surfaceobject.cpp
@@ -39,7 +39,8 @@ SurfaceObject::SurfaceObject()
SurfaceObject::~SurfaceObject()
{
- glDeleteBuffers(1, &m_gridElementbuffer);
+ if (QOpenGLContext::currentContext())
+ glDeleteBuffers(1, &m_gridElementbuffer);
}
void SurfaceObject::setUpSmoothData(const QSurfaceDataArray &dataArray, const QRect &space,