diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-09 13:49:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-09 13:49:09 +0200 |
| commit | 66feeb8de70291786499b3008ab8fded4043172a (patch) | |
| tree | 4c2029d9f51b2471c7c8dc0c3be9311640831595 /src/animation | |
| parent | 7eb41022f19a57505c8eef3497ad6710fc92bd7d (diff) | |
| parent | 15e863517ea37ca7ba6bcb75b078272eddbc5d37 (diff) | |
Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: I666d4ca1ad39f81e41a9b47a8828d1689ff2b33e
Diffstat (limited to 'src/animation')
| -rw-r--r-- | src/animation/backend/bezierevaluator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/animation/backend/bezierevaluator.cpp b/src/animation/backend/bezierevaluator.cpp index a56dc7007..8a7f0139b 100644 --- a/src/animation/backend/bezierevaluator.cpp +++ b/src/animation/backend/bezierevaluator.cpp @@ -153,8 +153,8 @@ float BezierEvaluator::parameterForTime(float time) const float roots[3]; const int numberOfRoots = findCubicRoots(coeffs, roots); for (int i = 0; i < numberOfRoots; ++i) { - if (roots[i] >= 0 && roots[i] <= 1) - return roots[i]; + if (roots[i] >= -0.01f && roots[i] <= 1.01f) + return qMin(qMax(roots[i], 0.0f), 1.0f); } qWarning() << "Failed to find root of cubic bezier at time" << time |