diff options
| author | Charles Yin <charles.yin@nokia.com> | 2011-11-14 10:35:51 +1000 |
|---|---|---|
| committer | Charles Yin <charles.yin@nokia.com> | 2011-11-14 10:35:51 +1000 |
| commit | fc54db69809a16f613f65a2761fab55d5911b02c (patch) | |
| tree | a00d9284eb13f81f5b195f8a4c6cfee03edb4f17 /src/declarative/particles/qquickparticlepainter.cpp | |
| parent | 35275892ca8a7046451b8e943985dd779fee4794 (diff) | |
| parent | 2557ff5a940242b398dee65c3c79cec088164e32 (diff) | |
| download | qtdeclarative-fc54db69809a16f613f65a2761fab55d5911b02c.tar.gz | |
Merge branch 'master' into animation-refactor
Conflicts:
tools/qmlviewer/qdeclarativetester.cpp
tools/qmlviewer/qmlruntime.cpp
Change-Id: I48f0eb02df27e4b524f45927939b4c257452b0aa
Diffstat (limited to 'src/declarative/particles/qquickparticlepainter.cpp')
| -rw-r--r-- | src/declarative/particles/qquickparticlepainter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/particles/qquickparticlepainter.cpp b/src/declarative/particles/qquickparticlepainter.cpp index cc0b4da181..6d44e9a944 100644 --- a/src/declarative/particles/qquickparticlepainter.cpp +++ b/src/declarative/particles/qquickparticlepainter.cpp @@ -91,9 +91,9 @@ void QQuickParticlePainter::setSystem(QQuickParticleSystem *arg) void QQuickParticlePainter::load(QQuickParticleData* d) { + initialize(d->group, d->index); if (m_pleaseReset) return; - initialize(d->group, d->index); m_pendingCommits << qMakePair<int, int>(d->group, d->index); } |