Merge remote-tracking branch 'origin/5.5' into 5.6

Change-Id: I3951f9cafc78723d4ad9e4b85b68a3b0b7493457

1 files changed, 3 insertions, 3 deletions

diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp
index f3b0b67e5..79aa2b4e5 100644
--- a/src/quick3d/imports/scene3d/scene3ditem.cpp
+++ b/src/quick3d/imports/scene3d/scene3ditem.cpp
@@ -609,13 +609,13 @@ void Scene3DRenderer::render()
 
     ContextSaver saver;
 
-    const QSize currentSize = m_item->boundingRect().size().toSize();
+    const QSize currentSize = m_item->boundingRect().size().toSize() * window->effectiveDevicePixelRatio();
     const bool forceRecreate = currentSize != m_lastSize || m_multisample != m_lastMultisample;
 
     // Rebuild FBO and textures if never created or a resize has occurred
     if ((m_multisampledFBO.isNull() || forceRecreate) && m_multisample) {
         qCDebug(Scene3D) << Q_FUNC_INFO << "Creating multisample framebuffer";
-        m_multisampledFBO.reset(createMultisampledFramebufferObject(m_item->boundingRect().size().toSize()));
+        m_multisampledFBO.reset(createMultisampledFramebufferObject(currentSize));
         if (m_multisampledFBO->format().samples() == 0 || !QOpenGLFramebufferObject::hasOpenGLFramebufferBlit()) {
             qCDebug(Scene3D) << Q_FUNC_INFO << "Failed to create multisample framebuffer";
             m_multisample = false;
@@ -624,7 +624,7 @@ void Scene3DRenderer::render()
     }
 
     if (m_finalFBO.isNull() || forceRecreate) {
-        m_finalFBO.reset(createFramebufferObject(m_item->boundingRect().size().toSize()));
+        m_finalFBO.reset(createFramebufferObject(currentSize));
         m_texture.reset(window->createTextureFromId(m_finalFBO->texture(), m_finalFBO->size(), QQuickWindow::TextureHasAlphaChannel));
         m_node->setTexture(m_texture.data());
     }