diff options
| author | Mika Salmela <mika.salmela@digia.com> | 2013-12-20 12:03:59 +0200 |
|---|---|---|
| committer | Mika Salmela <mika.salmela@digia.com> | 2013-12-20 12:05:37 +0200 |
| commit | eb3d0514ca886db33776522ea00f27b69bc86ad1 (patch) | |
| tree | 3439287f6a70f681c5c9a08c77ec1b4342a24768 /src/datavisualization/utils | |
| parent | 07aba602fc82ac31684988f8e8e22521d2b3c982 (diff) | |
| parent | e895c5085f6097983bdd617c39ea5184541d6c4d (diff) | |
Merge branch 'develop'
Change-Id: I7408ac3b14c3a9484d28f8c08eece6210a44025e
Diffstat (limited to 'src/datavisualization/utils')
| -rw-r--r-- | src/datavisualization/utils/abstractobjecthelper.cpp | 10 | ||||
| -rw-r--r-- | src/datavisualization/utils/surfaceobject.cpp | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/datavisualization/utils/abstractobjecthelper.cpp b/src/datavisualization/utils/abstractobjecthelper.cpp index d47f2fe6..96cdc0c4 100644 --- a/src/datavisualization/utils/abstractobjecthelper.cpp +++ b/src/datavisualization/utils/abstractobjecthelper.cpp @@ -34,10 +34,12 @@ AbstractObjectHelper::AbstractObjectHelper() AbstractObjectHelper::~AbstractObjectHelper() { - glDeleteBuffers(1, &m_vertexbuffer); - glDeleteBuffers(1, &m_uvbuffer); - glDeleteBuffers(1, &m_normalbuffer); - glDeleteBuffers(1, &m_elementbuffer); + if (QOpenGLContext::currentContext()) { + glDeleteBuffers(1, &m_vertexbuffer); + glDeleteBuffers(1, &m_uvbuffer); + glDeleteBuffers(1, &m_normalbuffer); + glDeleteBuffers(1, &m_elementbuffer); + } } GLuint AbstractObjectHelper::vertexBuf() 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, |