From 852983a6d9dc5d57753d6eadf779d6607497ac64 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Thu, 22 Sep 2011 13:48:19 +1000 Subject: [PATCH] Recognize deformable performance level properly Task-number: QTBUG-21305 Change-Id: I88cfe56f0f22abc92a083b2a0a8da059ebefc652 Reviewed-on: http://codereview.qt-project.org/5344 Reviewed-by: Qt Sanity Bot Reviewed-by: Martin Jones --- examples/declarative/particles/imageparticle/deformation.qml | 1 - src/declarative/particles/qsgimageparticle.cpp | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/declarative/particles/imageparticle/deformation.qml b/examples/declarative/particles/imageparticle/deformation.qml index 3787b1e..989a699 100644 --- a/examples/declarative/particles/imageparticle/deformation.qml +++ b/examples/declarative/particles/imageparticle/deformation.qml @@ -60,7 +60,6 @@ Rectangle { groups: ["goingDown"] source: "../images/squarefacespriteXX.png" yVector: PointDirection { y: 0.5; yVariation: 0.25; xVariation: 0.25; } - rotation: 180 } Timer { diff --git a/src/declarative/particles/qsgimageparticle.cpp b/src/declarative/particles/qsgimageparticle.cpp index d21f5f0..dd50ce2 100644 --- a/src/declarative/particles/qsgimageparticle.cpp +++ b/src/declarative/particles/qsgimageparticle.cpp @@ -1056,7 +1056,8 @@ QSGGeometryNode* QSGImageParticle::buildParticleNodes() || !m_opacitytable_name.isEmpty()) { perfLevel = Tabled; } else if (m_autoRotation || m_rotation || m_rotationVariation - || m_rotationSpeed || m_rotationSpeedVariation) { + || m_rotationSpeed || m_rotationSpeedVariation + || m_xVector || m_yVector) { perfLevel = Deformable; } else if (m_alphaVariation || m_alpha != 1.0 || m_color.isValid() || m_color_variation || m_redVariation || m_blueVariation || m_greenVariation) { -- 2.7.4