Merge remote-tracking branch 'origin/qds/dev'

Change-Id: I6c657f5b8c0602ca76e9b17b10f1ff7a38b1b8be
This commit is contained in:
Tim Jenssen
2023-12-14 19:32:20 +01:00
151 changed files with 3628 additions and 2036 deletions

View File

@@ -307,10 +307,20 @@ void CurveEditorView::commitKeyframes(TreeItem *item)
auto replaceKeyframes = [&group, pitem, this] {
m_block = true;
for (auto& frame : group.keyframes())
frame.destroy();
AnimationCurve curve = pitem->curve();
unsigned int i = 0;
const size_t numberOfKeyFrames = curve.keyframes().size();
for (auto &frame : group.keyframes()) {
if (i < numberOfKeyFrames) {
QPointF pos = curve.keyframes().at(i).position();
frame.variantProperty("frame").setValue(pos.x());
} else {
frame.destroy();
}
i++;
}
if (curve.valueType() == AnimationCurve::ValueType::Bool) {
for (const auto& frame : curve.keyframes()) {
QPointF pos = frame.position();