diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-08-06 15:57:54 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-08-06 15:59:09 +0200 |
commit | 27deff6d2b5a9eb1d98cd7b377ab934a35086664 (patch) | |
tree | 4c34e422a8a838c59de68e7017d533cfb56d8eb5 /src/particles/qquickimageparticle.cpp | |
parent | 0cca56f30d6a0290841859a58f517cece13d8d81 (diff) | |
parent | f3cbd0b8aa96abfc4b3660df4426ed10b11b18e0 (diff) |
Merge branch 'wip/v4' of ssh://codereview.qt-project.org/qt/qtdeclarative into dev
Change-Id: I278524d0f43d2237201d9cf78c1c36a5ecc83d84
Diffstat (limited to 'src/particles/qquickimageparticle.cpp')
-rw-r--r-- | src/particles/qquickimageparticle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp index 64a90bd8d4..c3e13f162f 100644 --- a/src/particles/qquickimageparticle.cpp +++ b/src/particles/qquickimageparticle.cpp @@ -1651,9 +1651,9 @@ void QQuickImageParticle::spritesUpdate(qreal time) qreal frame = (time - datum->animT)/(datum->frameDuration / 1000.0); frame = qBound((qreal)0.0, frame, (qreal)((qreal)datum->frameCount - 1.0));//Stop at count-1 frames until we have between anim interpolation if (m_spritesInterpolate) - progress = modf(frame,&frameAt); + progress = std::modf(frame,&frameAt); else - modf(frame,&frameAt); + std::modf(frame,&frameAt); } else { datum->frameAt++; if (datum->frameAt >= datum->frameCount){ |