diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2018-04-27 14:32:42 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2018-04-27 12:58:21 +0000 |
| commit | e60155d6af1a9e1c86bfb7679dbd92ce616ad8fd (patch) | |
| tree | b683293e72e8000bcb6f3d00211c3e4215ac32f6 | |
| parent | 30c03aa5b05baab7a5190ce40db029a50ad935f6 (diff) | |
Check if interpolator exists
If no interpolated exists simply return the value
of the previews keyframe.
Change-Id: Iae65caa0000c22fe594deab6300228552e9f5ed6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| -rw-r--r-- | src/imports/timeline/qquickkeyframe.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/imports/timeline/qquickkeyframe.cpp b/src/imports/timeline/qquickkeyframe.cpp index 5ea84f0..dc13895 100644 --- a/src/imports/timeline/qquickkeyframe.cpp +++ b/src/imports/timeline/qquickkeyframe.cpp @@ -329,6 +329,9 @@ QVariant QQuickKeyframe::evaluate(QQuickKeyframe *pre, qreal frametime, int user QVariant convertedValue = value(); convertedValue.convert(userType); + if (!interpolator) + return preValue; + if (preValue.isValid() && convertedValue.isValid()) return interpolator(preValue.constData(), convertedValue.constData(), progress); |