diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:16:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:16:41 +0100 |
| commit | 7722638fcd57f2e826bac61c3bf9ab2a7e190088 (patch) | |
| tree | 54a569112ceec8355a53e25202fc60c5397f6a42 /src | |
| parent | 3a965b26e38d551cac80a0e9ba1ffb4bf082a6df (diff) | |
| parent | 966bdad4d56ebb06e94aa8f33cb70f15ec288976 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Iea700ac85da7205933622b61e1c43f774c82e45a
Diffstat (limited to 'src')
| -rw-r--r-- | src/datavisualization/doc/qtdatavis3d.qdocconf | 3 | ||||
| -rw-r--r-- | src/datavisualization/engine/surface3drenderer.cpp | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/datavisualization/doc/qtdatavis3d.qdocconf b/src/datavisualization/doc/qtdatavis3d.qdocconf index 63aa334d..71eb43ec 100644 --- a/src/datavisualization/doc/qtdatavis3d.qdocconf +++ b/src/datavisualization/doc/qtdatavis3d.qdocconf @@ -49,4 +49,5 @@ navigation.landingpage = Qt Data Visualization navigation.cppclassespage = Qt Data Visualization C++ Classes navigation.qmltypespage = Qt Data Visualization QML Types -manifestmeta.highlighted.names += "QtDataVisualization/Bars Example" +manifestmeta.highlighted.names = "QtDataVisualization/Bars Example" \ + "QtDataVisualization/Qt Quick 2 Surface Multiseries Example" 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()); |