diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:43:43 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 09:00:32 +0100 |
commit | ee68813c81d5c3d40af6d362f851d54099bf86f6 (patch) | |
tree | 5c32da456e4a041dc71168ac5d30ea586cd8dcca /src | |
parent | 0565aadd971adb0fa0c09b6f9d04cc1cef1b12fd (diff) | |
parent | 32fc1c7d360fe2eff44666fb1a8c4fb7d538ddc7 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.qmake.conf
Change-Id: Ibd0e0140e7055c7819a65e661a96095648de6fcd
Diffstat (limited to 'src')
-rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp index fa8bae8e..cad9b97c 100644 --- a/src/datavisualization/engine/surface3drenderer.cpp +++ b/src/datavisualization/engine/surface3drenderer.cpp @@ -317,8 +317,12 @@ void Surface3DRenderer::updateSurfaceTextures(QVector<QSurface3DSeries *> series const QSurfaceDataArray &array = *dataProxy->array(); if (!series->texture().isNull()) { - cache->setSurfaceTexture(m_textureHelper->create2DTexture( - series->texture(), true, true, true)); + GLuint texId = m_textureHelper->create2DTexture(series->texture(), + true, true, true, true); + glBindTexture(GL_TEXTURE_2D, texId); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glBindTexture(GL_TEXTURE_2D, 0); + cache->setSurfaceTexture(texId); if (cache->isFlatShadingEnabled()) cache->surfaceObject()->coarseUVs(array, cache->dataArray()); |