diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2011-09-09 14:44:04 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-13 01:43:39 +0200 |
| commit | fbf7ba6c0e75ed61662fc748af06513a6b96b4e1 (patch) | |
| tree | abb631e876c2f92f5c6902753934e083bad2ff68 /src/declarative/particles | |
| parent | fded142474bcafd3a5a26e93814ff4d36acbda05 (diff) | |
Order of operations fix
Recycling needs to be done always, and currently here is the only time
it's supposed to happen each tick.
Change-Id: Ia03b2a6d1d884bdee784b47c447745c7e3aee2c6
Reviewed-on: http://codereview.qt-project.org/4508
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/particles')
| -rw-r--r-- | src/declarative/particles/qsgparticlesystem.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/particles/qsgparticlesystem.cpp b/src/declarative/particles/qsgparticlesystem.cpp index 425df349e5..085e6afe64 100644 --- a/src/declarative/particles/qsgparticlesystem.cpp +++ b/src/declarative/particles/qsgparticlesystem.cpp @@ -1009,7 +1009,7 @@ void QSGParticleSystem::updateCurrentTime( int currentTime ) bool oldClear = m_empty; m_empty = true; foreach (QSGParticleGroupData* gd, m_groupData)//Recycle all groups and see if they're out of live particles - m_empty = m_empty && gd->recycle(); + m_empty = gd->recycle() && m_empty; if (m_spriteEngine) m_spriteEngine->updateSprites(m_timeInt); |