godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #40643 from KoBeWi/key_keeper

Browse Source 
Keep transition value when replacing key
This commit is contained in:
Rémi Verschelde 2020-07-24 00:03:43 +02:00 committed by GitHub
commit b642e430ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/resources/animation.cpp
View File

@ -752,7 +752,9 @@ int Animation::_insert(float p_time, T &p_keys, const V &p_value) {
while (true) { while (true) {
// Condition for replacement. // Condition for replacement.
if (idx > 0 && Math::is_equal_approx(p_keys[idx - 1].time, p_time)) { if (idx > 0 && Math::is_equal_approx(p_keys[idx - 1].time, p_time)) {
float transition = p_keys[idx - 1].transition;
p_keys.write[idx - 1] = p_value; p_keys.write[idx - 1] = p_value;
p_keys.write[idx - 1].transition = transition;
return idx - 1; return idx - 1;
// Condition for insert. // Condition for insert.