Merge branch 'develop' into develop

This commit is contained in:
Siarhei Parfianiuk
2019-05-11 12:30:19 +02:00
committed by GitHub
26 changed files with 1692 additions and 823 deletions

View File

@@ -327,18 +327,13 @@ bool Keyframe::IsIncreasing(int index)
}
}
if (current_value < next_value) {
// Increasing
return true;
}
else if (current_value >= next_value) {
if (current_value >= next_value) {
// Decreasing
return false;
}
}
else
// return default true (since most curves increase)
return true;
// return default true (since most curves increase)
return true;
}
// Generate JSON string of this object