diff options
| -rw-r--r-- | dist/changes-1.2.3 | 3 | ||||
| -rw-r--r-- | dist/changes-5.9.2 | 26 | ||||
| -rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 8 |
3 files changed, 35 insertions, 2 deletions
diff --git a/dist/changes-1.2.3 b/dist/changes-1.2.3 new file mode 100644 index 00000000..218ff0d2 --- /dev/null +++ b/dist/changes-1.2.3 @@ -0,0 +1,3 @@ +Qt Data Visualization 1.2.3 + +No changes diff --git a/dist/changes-5.9.2 b/dist/changes-5.9.2 new file mode 100644 index 00000000..23df4e6d --- /dev/null +++ b/dist/changes-5.9.2 @@ -0,0 +1,26 @@ +Qt 5.9.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.9.2 Changes * +**************************************************************************** + +Fixed issues +------------ +- [QTBUG-62996] Surface texture bleeds color on edges 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()); |