From fbf7ba6c0e75ed61662fc748af06513a6b96b4e1 Mon Sep 17 00:00:00 2001 From: Alan Alpert Date: Fri, 9 Sep 2011 14:44:04 +1000 Subject: [PATCH] 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 Reviewed-by: Martin Jones --- 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 425df34..085e6af 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); -- 1.7.2.5