diff options
| author | Chris Adams <christopher.adams@nokia.com> | 2011-05-18 12:32:28 +1000 |
|---|---|---|
| committer | Chris Adams <christopher.adams@nokia.com> | 2011-05-18 12:32:28 +1000 |
| commit | 616c7e768f3d88f6b8be6af72290769e99500e72 (patch) | |
| tree | b0e568857e392809934fedf0e6511b61f2115032 /src/declarative/items/qsgshadereffectsource.cpp | |
| parent | d90a4c05c34a38922e78d14856e26305bebe096e (diff) | |
Revert "Support mirroring the source rectangle of ShaderEffectSource."
This reverts commit 155faa3b8b1e04241bd53df3eb008d54a71cc667.
The original commit broke behavior enforced by the tst_qdeclarativeqt
unit test, specifically relating to QRectF.
Diffstat (limited to 'src/declarative/items/qsgshadereffectsource.cpp')
| -rw-r--r-- | src/declarative/items/qsgshadereffectsource.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/items/qsgshadereffectsource.cpp b/src/declarative/items/qsgshadereffectsource.cpp index 5b6f305f17..199a56067e 100644 --- a/src/declarative/items/qsgshadereffectsource.cpp +++ b/src/declarative/items/qsgshadereffectsource.cpp @@ -774,12 +774,12 @@ QSGNode *QSGShaderEffectSource::updatePaintNode(QSGNode *oldNode, UpdatePaintNod tex->setLive(m_live); tex->setItem(QSGItemPrivate::get(m_sourceItem)->itemNode()); - QRectF sourceRect = m_sourceRect.isNull() + QRectF sourceRect = m_sourceRect.isEmpty() ? QRectF(0, 0, m_sourceItem->width(), m_sourceItem->height()) : m_sourceRect; tex->setRect(sourceRect); QSize textureSize = m_textureSize.isEmpty() - ? QSize(qCeil(qAbs(sourceRect.width())), qCeil(qAbs(sourceRect.height()))) + ? QSize(qCeil(sourceRect.width()), qCeil(sourceRect.height())) : m_textureSize; tex->setSize(textureSize); tex->setRecursive(m_recursive); |