Merge branch 'master' into nodeview-redux

2021-05-21 11:13:42 +10:00
parent f2d64728f9 45db6f4596
commit 0ce602c132
66 changed files with 1066 additions and 569 deletions
@@ -591,8 +591,7 @@ QVariant Node::GetSplitValueAtTimeOnTrack(const QString &input, const rational &
      NodeKeyframe* after = key_track.at(i+1);

      if (before->time() == time
-          || !NodeValue::type_can_be_interpolated(type)
-          || (before->type() == NodeKeyframe::kHold && after->time() > time)) {
+          || ((!NodeValue::type_can_be_interpolated(type) || before->type() == NodeKeyframe::kHold) && after->time() > time)) {

        // Time == keyframe time, so value is precise
        return before->value();