Fix Q3DScatter memory leak

When using static optimization for scattergraph
and series mesh type is not point mesh,
the scatter3D renderer uses
ScatterObjectBufferHelper's fullLoad. In
the fullLoad old data buffers are deleted, if
m_meshDataLoaded is set to true. However, at the
beginning of the fullLoad, the flag was always
set to false so old data buffers were
never deleted. Moved the setting of
the m_meshDataLoaded to false after the deletion
of old buffers. Added similar code to
scatterpointbufferhelper for consistency.

Pick-to: 5.15 6.1
Fixes: QTBUG-80194
Change-Id: I2fd71af86b1fd73621074187f112fd9783df36df
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

2 files changed, 2 insertions, 1 deletions

diff --git a/src/datavisualization/utils/scatterobjectbufferhelper.cpp b/src/datavisualization/utils/scatterobjectbufferhelper.cpp
index 04aa350a..0efd8572 100644
--- a/src/datavisualization/utils/scatterobjectbufferhelper.cpp
+++ b/src/datavisualization/utils/scatterobjectbufferhelper.cpp
@@ -48,7 +48,6 @@ ScatterObjectBufferHelper::~ScatterObjectBufferHelper()
 
 void ScatterObjectBufferHelper::fullLoad(ScatterSeriesRenderCache *cache, qreal dotScale)
 {
-    m_meshDataLoaded = false;
     m_indexCount = 0;
 
     ObjectHelper *dotObj = cache->object();
@@ -71,6 +70,7 @@ void ScatterObjectBufferHelper::fullLoad(ScatterSeriesRenderCache *cache, qreal
         m_uvbuffer = 0;
         m_normalbuffer = 0;
         m_elementbuffer = 0;
+        m_meshDataLoaded = false;
     }
 
     // Index vertices
diff --git a/src/datavisualization/utils/scatterpointbufferhelper.cpp b/src/datavisualization/utils/scatterpointbufferhelper.cpp
index 751e5639..9600a386 100644
--- a/src/datavisualization/utils/scatterpointbufferhelper.cpp
+++ b/src/datavisualization/utils/scatterpointbufferhelper.cpp
@@ -97,6 +97,7 @@ void ScatterPointBufferHelper::load(ScatterSeriesRenderCache *cache)
         m_bufferedPoints.clear();
         m_pointbuffer = 0;
         m_uvbuffer = 0;
+        m_meshDataLoaded = false;
     }
 
     bool itemsVisible = false;