summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2014-11-21 14:38:52 +0200
committerMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2014-11-21 14:39:05 +0200
commitcf5e1e4413c7d31fbd4586bde33469d3f6fe686a (patch)
treebcf5ca4fd4a4db9ca150042017d8f2710596ba74
parent7c85e5674426ee8b2e6c73399dba7695f0141155 (diff)
parent6939d7e10ab289abb5cbe8051ee1660fadcb34e7 (diff)
Merge branch 'develop'
-rw-r--r--src/datavisualization/utils/surfaceobject.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/datavisualization/utils/surfaceobject.cpp b/src/datavisualization/utils/surfaceobject.cpp
index 6f9ace19..b3aa7126 100644
--- a/src/datavisualization/utils/surfaceobject.cpp
+++ b/src/datavisualization/utils/surfaceobject.cpp
@@ -325,12 +325,14 @@ void SurfaceObject::smoothUVs(const QSurfaceDataArray &dataArray,
}
}
- glBindBuffer(GL_ARRAY_BUFFER, m_uvTextureBuffer);
- glBufferData(GL_ARRAY_BUFFER, uvs.size() * sizeof(QVector2D),
- &uvs.at(0), GL_STATIC_DRAW);
- glBindBuffer(GL_ARRAY_BUFFER, 0);
+ if (uvs.size() > 0) {
+ glBindBuffer(GL_ARRAY_BUFFER, m_uvTextureBuffer);
+ glBufferData(GL_ARRAY_BUFFER, uvs.size() * sizeof(QVector2D),
+ &uvs.at(0), GL_STATIC_DRAW);
+ glBindBuffer(GL_ARRAY_BUFFER, 0);
- m_returnTextureBuffer = true;
+ m_returnTextureBuffer = true;
+ }
}
void SurfaceObject::updateSmoothRow(const QSurfaceDataArray &dataArray, int rowIndex, bool polar)