diff options
| author | Albert Astals Cid <albert.astals@canonical.com> | 2016-06-30 16:54:13 +0200 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals@canonical.com> | 2016-07-05 11:05:27 +0000 |
| commit | 506ae2dba8270341cbe3ee6435baf472b0d1abed (patch) | |
| tree | f5ebfe08e6d6bd9f72a2eea8769c68bdb62ad534 /src/quick | |
| parent | 240c2ef60e854575dced056d916f8a8922905e8f (diff) | |
Fix crash in QQuickShaderEffect::updatePaintNode
When having a ShaderEffect and an Image sharing the texture via supportsAtlasTextures
This used to work fine in 5.4 but 38cab579a0c5398b7621221fd8609bc43cf1f3c5
removed the check for the provider not being null
Change-Id: I18cb969dbf8011ea01543cc079214e8ecbb66623
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/items/qquickshadereffect.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp index 94fa7e92e3..690433af4b 100644 --- a/src/quick/items/qquickshadereffect.cpp +++ b/src/quick/items/qquickshadereffect.cpp @@ -1054,7 +1054,7 @@ QSGNode *QQuickShaderEffect::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDa bool geometryUsesTextureSubRect = false; if (m_supportsAtlasTextures && material->textureProviders.size() == 1) { QSGTextureProvider *provider = material->textureProviders.at(0); - if (provider->texture()) { + if (provider && provider->texture()) { srcRect = provider->texture()->normalizedTextureSubRect(); geometryUsesTextureSubRect = true; } |