diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-04-28 09:31:10 +0300 |
---|---|---|
committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-04-28 10:05:33 +0300 |
commit | d5fe794178f755a259e7680bbf11571785abe14d (patch) | |
tree | c96ef2f5c6f707b4639fdd740f91f8e2679c63e7 /src/datavisualization/engine/abstract3drenderer.cpp | |
parent | ac276e4f176844e6048ad3eb7b4de5eed7eaefcf (diff) |
Fix texture cleanup.
Make deleteTexture also zero the pointer and do the check if
deletion is needed, as those are required anyway on the caller
side in most cases.
Change-Id: Ia12102c97a647127230db2518c32f81322ce6743
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization/engine/abstract3drenderer.cpp')
-rw-r--r-- | src/datavisualization/engine/abstract3drenderer.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp index 458630ed..bd19959b 100644 --- a/src/datavisualization/engine/abstract3drenderer.cpp +++ b/src/datavisualization/engine/abstract3drenderer.cpp @@ -475,11 +475,7 @@ void Abstract3DRenderer::lowerShadowQuality() void Abstract3DRenderer::generateBaseColorTexture(const QColor &color, GLuint *texture) { - if (*texture) { - m_textureHelper->deleteTexture(texture); - *texture = 0; - } - + m_textureHelper->deleteTexture(texture); *texture = m_textureHelper->createUniformTexture(color); } @@ -489,10 +485,7 @@ void Abstract3DRenderer::fixGradientAndGenerateTexture(QLinearGradient *gradient gradient->setStart(qreal(gradientTextureWidth), qreal(gradientTextureHeight)); gradient->setFinalStop(0.0, 0.0); - if (*gradientTexture) { - m_textureHelper->deleteTexture(gradientTexture); - *gradientTexture = 0; - } + m_textureHelper->deleteTexture(gradientTexture); *gradientTexture = m_textureHelper->createGradientTexture(*gradient); } |