diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-10-05 11:26:57 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-05 07:33:29 +0200 |
| commit | 08c975bd77f8fdbbdb5c4694d898a724db900849 (patch) | |
| tree | 9b50e1910c5cade3ba7d8dbdb772b316ed48dfc2 /src/declarative/particles/qsgparticleaffector.cpp | |
| parent | e225ee5a6a50400fc02536e511b1e10f3d53f110 (diff) | |
Sprites can now have varying width and height
Varying between Sprites, or between width and height, not within a
single Sprite. For ImageParticle only, SpriteImage changes will be in a
later commit.
Also adds spriteInterpolation boolean.
Change-Id: I80681e44f26985a6f6a6b83bd162f6231c7f28c4
Reviewed-on: http://codereview.qt-project.org/6002
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/particles/qsgparticleaffector.cpp')
| -rw-r--r-- | src/declarative/particles/qsgparticleaffector.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/particles/qsgparticleaffector.cpp b/src/declarative/particles/qsgparticleaffector.cpp index 62f5ccd670..24bddea5f7 100644 --- a/src/declarative/particles/qsgparticleaffector.cpp +++ b/src/declarative/particles/qsgparticleaffector.cpp @@ -208,7 +208,7 @@ bool QSGParticleAffector::affectParticle(QSGParticleData *, qreal ) void QSGParticleAffector::reset(QSGParticleData* pd) {//TODO: This, among other ones, should be restructured so they don't all need to remember to call the superclass if (m_onceOff) - if (activeGroup(d->group)) + if (activeGroup(pd->group)) m_onceOffed.remove(qMakePair(pd->group, pd->index)); } |