diff options
| author | Kim Motoyoshi Kalland <kim.kalland@nokia.com> | 2012-06-08 12:11:29 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-11 11:04:23 +0200 |
| commit | e7fdd1bfa0af53dbfb87a7f6a30175ca0917dd3b (patch) | |
| tree | 7271493edb2d74f0a5406f68322be01cc31e4232 /src/quick/items/qquickimage.cpp | |
| parent | 6f7bb92e5df069716bef9639c965b4c8a9aaaabf (diff) | |
Add support for using atlas textures directly in ShaderEffects.
Change-Id: Ib2b68c13513e2c1102264a3eb1d91ed840134159
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/quick/items/qquickimage.cpp')
| -rw-r--r-- | src/quick/items/qquickimage.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp index 493bf08a4b..113bb3461e 100644 --- a/src/quick/items/qquickimage.cpp +++ b/src/quick/items/qquickimage.cpp @@ -63,10 +63,6 @@ public: } QSGTexture *texture() const { - - if (m_texture && m_texture->isAtlasTexture()) - const_cast<QQuickImageTextureProvider *>(this)->m_texture = m_texture->removedFromAtlas(); - if (m_texture) { m_texture->setFiltering(m_smooth ? QSGTexture::Linear : QSGTexture::Nearest); m_texture->setMipmapFiltering(QSGTexture::Nearest); |