diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-09-22 13:48:19 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-22 07:22:11 +0200 |
| commit | 852983a6d9dc5d57753d6eadf779d6607497ac64 (patch) | |
| tree | 73b0d192c4970550af0141734c2aa8a02a241f61 | |
| parent | cc3f830c030e271f258bb330e5bc1fc400196389 (diff) | |
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 <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
| -rw-r--r-- | examples/declarative/particles/imageparticle/deformation.qml | 1 | ||||
| -rw-r--r-- | 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 3787b1e402..989a699395 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 d21f5f03c4..dd50ce2e83 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) { |