Cache ObjectHelper instances

Task-number: QTRD-2792
Change-Id: I90d83bd9b73a0f337fd26f1b92000e72b3ec0607
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>

1 files changed, 2 insertions, 8 deletions

diff --git a/src/datavisualization/engine/seriesrendercache.cpp b/src/datavisualization/engine/seriesrendercache.cpp
index e674ae43..e4f221f8 100644
--- a/src/datavisualization/engine/seriesrendercache.cpp
+++ b/src/datavisualization/engine/seriesrendercache.cpp
@@ -109,13 +109,7 @@ void SeriesRenderCache::populate(bool newSeries)
             m_renderer->fixMeshFileName(meshFileName, m_mesh);
         }
 
-        delete m_object;
-        if (meshFileName.isEmpty()) {
-            m_object = 0;
-        } else {
-            m_object = new ObjectHelper(meshFileName);
-            m_object->load();
-        }
+        ObjectHelper::resetObjectHelper(m_renderer, m_object, meshFileName);
     }
 
     if (newSeries || changeTracker.meshRotationChanged) {
@@ -193,7 +187,7 @@ void SeriesRenderCache::populate(bool newSeries)
 
 void SeriesRenderCache::cleanup(TextureHelper *texHelper)
 {
-    delete m_object;
+    ObjectHelper::releaseObjectHelper(m_renderer, m_object);
     if (QOpenGLContext::currentContext()) {
         texHelper->deleteTexture(&m_baseUniformTexture);
         texHelper->deleteTexture(&m_baseGradientTexture);