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

Merge pull request #25012 from avencherus/prevent-duplicate-keyframes 

Do precision comparison to prevent the creation of keyframes with a time that already exists
This commit is contained in:
Rémi Verschelde 2019-05-29 18:59:19 +02:00 committed by GitHub
parent bc816f93c6 e03f9ead21
commit c11bf884e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scene/resources/animation.cpp
View File

@ -819,15 +819,17 @@ int Animation::_insert(float p_time, T &p_keys, const V &p_value) {
while (true) {
if (idx == 0 || p_keys[idx - 1].time < p_time) {
//condition for insertion.
p_keys.insert(idx, p_value);
return idx;
} else if (p_keys[idx - 1].time == p_time) {
// Condition for replacement.
if (idx > 0 && Math::is_equal_approx(p_keys[idx - 1].time, p_time)) {
// condition for replacing.
p_keys.write[idx - 1] = p_value;
return idx - 1;
// Condition for insert.
} else if (idx == 0 || p_keys[idx - 1].time < p_time) {
p_keys.insert(idx, p_value);
return idx;
}
idx--;