aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/particles/qquickparticlepainter.cpp
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2011-12-20 20:08:33 +1000
committerQt by Nokia <qt-info@nokia.com>2011-12-22 06:55:20 +0100
commit220b264acc6bf1823bd06f99ebdbee352ff57e3a (patch)
tree0fa17ef32c3035b48bf61c4d365c007bbcf7a3e0 /src/quick/particles/qquickparticlepainter.cpp
parentb6c8497cdf070c8404a1f3784c4ee6df191bd546 (diff)
Clear pending commits on reset
They will be caught when the nodes are rebuilt, if they're still valid. Change-Id: Iac6e790b604a7deaba98a50dd07754459e9f5e14 Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/particles/qquickparticlepainter.cpp')
-rw-r--r--src/quick/particles/qquickparticlepainter.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/particles/qquickparticlepainter.cpp b/src/quick/particles/qquickparticlepainter.cpp
index 812c4b86dc..248bf24bad 100644
--- a/src/quick/particles/qquickparticlepainter.cpp
+++ b/src/quick/particles/qquickparticlepainter.cpp
@@ -106,6 +106,8 @@ void QQuickParticlePainter::reload(QQuickParticleData* d)
void QQuickParticlePainter::reset()
{
+ m_pendingCommits.clear();
+ m_pleaseReset = true;
}
void QQuickParticlePainter::setCount(int c)//### TODO: some resizeing so that particles can reallocate on size change instead of recreate