From e60155d6af1a9e1c86bfb7679dbd92ce616ad8fd Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 27 Apr 2018 14:32:42 +0200 Subject: Check if interpolator exists If no interpolated exists simply return the value of the previews keyframe. Change-Id: Iae65caa0000c22fe594deab6300228552e9f5ed6 Reviewed-by: Tim Jenssen --- src/imports/timeline/qquickkeyframe.cpp | 3 +++ 1 file changed, 3 insertions(+) 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); -- cgit v1.2.3