diff options
Diffstat (limited to 'src/imports/timeline/qquickkeyframe.cpp')
-rw-r--r-- | src/imports/timeline/qquickkeyframe.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/imports/timeline/qquickkeyframe.cpp b/src/imports/timeline/qquickkeyframe.cpp index a8c72c4..e6aeeeb 100644 --- a/src/imports/timeline/qquickkeyframe.cpp +++ b/src/imports/timeline/qquickkeyframe.cpp @@ -340,8 +340,12 @@ QVariant QQuickKeyframe::evaluate(QQuickKeyframe *pre, qreal frametime, int user QVariant convertedValue = value(); convertedValue.convert(userType); - if (!interpolator) - return preValue; + if (!interpolator) { + if (progress < 1.0) + return preValue; + + return convertedValue; + } if (preValue.isValid() && convertedValue.isValid()) return interpolator(preValue.constData(), convertedValue.constData(), progress); |