Merge remote-tracking branch 'origin/develop'

Change-Id: I6daaea503f62b0f1e9af56ce3bd5931d5e4afc45

1 files changed, 17 insertions, 11 deletions

diff --git a/src/datavisualization/utils/scatterpointbufferhelper.cpp b/src/datavisualization/utils/scatterpointbufferhelper.cpp
index 0f290aeb..b14d84ad 100644
--- a/src/datavisualization/utils/scatterpointbufferhelper.cpp
+++ b/src/datavisualization/utils/scatterpointbufferhelper.cpp
@@ -20,7 +20,6 @@
 
 QT_BEGIN_NAMESPACE_DATAVISUALIZATION
 
-const GLfloat itemScaler = 3.0f;
 const QVector3D hiddenPos(-1000.0f, -1000.0f, -1000.0f);
 
 ScatterPointBufferHelper::ScatterPointBufferHelper()
@@ -82,6 +81,7 @@ void ScatterPointBufferHelper::load(ScatterSeriesRenderCache *cache)
 
     ScatterRenderItemArray &renderArray = cache->renderArray();
     const int renderArraySize = renderArray.size();
+    m_indexCount = 0;
 
     if (m_meshDataLoaded) {
         // Delete old data
@@ -89,25 +89,31 @@ void ScatterPointBufferHelper::load(ScatterSeriesRenderCache *cache)
         m_bufferedPoints.clear();
     }
 
+    bool itemsVisible = false;
     m_bufferedPoints.resize(renderArraySize);
     for (int i = 0; i < renderArraySize; i++) {
         ScatterRenderItem &item = renderArray[i];
-        if (!item.isVisible())
+        if (!item.isVisible()) {
             m_bufferedPoints[i] = hiddenPos;
-        else
+        } else {
+            itemsVisible = true;
             m_bufferedPoints[i] = item.translation();
+        }
     }
 
-    m_indexCount = renderArraySize;
+    if (itemsVisible)
+        m_indexCount = renderArraySize;
 
-    glGenBuffers(1, &m_pointbuffer);
-    glBindBuffer(GL_ARRAY_BUFFER, m_pointbuffer);
-    glBufferData(GL_ARRAY_BUFFER, m_bufferedPoints.size() * sizeof(QVector3D),
-                 &m_bufferedPoints.at(0),
-                 GL_DYNAMIC_DRAW);
-    glBindBuffer(GL_ARRAY_BUFFER, 0);
+    if (m_indexCount > 0) {
+        glGenBuffers(1, &m_pointbuffer);
+        glBindBuffer(GL_ARRAY_BUFFER, m_pointbuffer);
+        glBufferData(GL_ARRAY_BUFFER, m_bufferedPoints.size() * sizeof(QVector3D),
+                     &m_bufferedPoints.at(0),
+                     GL_DYNAMIC_DRAW);
+        glBindBuffer(GL_ARRAY_BUFFER, 0);
 
-    m_meshDataLoaded = true;
+        m_meshDataLoaded = true;
+    }
 }
 
 QT_END_NAMESPACE_DATAVISUALIZATION