diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-16 08:57:59 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-09-16 08:58:07 +0200 |
commit | a273a0ad9c1df7aed612ee6353753f668d545076 (patch) | |
tree | 229f361813dd4ba268e7914e5b00a6e664ced5a4 /src/quick | |
parent | 4e6c5eade5504b335e31bd0950b9a702f8db58e7 (diff) | |
parent | c1d726fe19c83cf081042e55ace9d9d7b31c40e6 (diff) |
Merge remote-tracking branch 'origin/5.6.2' into 5.6
Change-Id: I410c2bd25a1bddc0e395316d62791437684b8942
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/scenegraph/util/qsgdefaultpainternode.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp index e3103341cd..7a92d61016 100644 --- a/src/quick/scenegraph/util/qsgdefaultpainternode.cpp +++ b/src/quick/scenegraph/util/qsgdefaultpainternode.cpp @@ -218,7 +218,7 @@ void QSGDefaultPainterNode::updateGeometry() if (m_actualRenderTarget == QQuickPaintedItem::Image) source = QRectF(0, 0, 1, 1); else - source = QRectF(0, 0, qreal(m_size.width()) / m_fboSize.width(), qreal(m_size.height()) / m_fboSize.height()); + source = QRectF(0, 0, qreal(m_textureSize.width()) / m_fboSize.width(), qreal(m_textureSize.height()) / m_fboSize.height()); QRectF dest(0, 0, m_size.width(), m_size.height()); if (m_actualRenderTarget == QQuickPaintedItem::InvertedYFramebufferObject) dest = QRectF(QPointF(0, m_size.height()), QPointF(m_size.width(), 0)); @@ -300,7 +300,7 @@ void QSGDefaultPainterNode::updateRenderTarget() QSGPainterTexture *texture = new QSGPainterTexture; if (m_actualRenderTarget == QQuickPaintedItem::Image) { texture->setOwnsTexture(true); - texture->setTextureSize(m_size); + texture->setTextureSize(m_textureSize); } else { texture->setTextureId(m_fbo->texture()); texture->setOwnsTexture(false); |