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

Remove animation tracks with correct indices 

(cherry picked from commit 3d7facd21c)
This commit is contained in:
Chia-Hsiang Cheng 2023-09-14 21:48:04 +08:00 committed by Yuri Sizov
parent 89dd2d066f
commit bad5e93945
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
editor/scene_tree_dock.cpp
View File

@ -1738,6 +1738,8 @@ void SceneTreeDock::perform_node_renames(Node *p_base, HashMap<Node *, NodePath>
continue; continue;
} }
int tracks_removed = 0;
for (int i = 0; i < anim->get_track_count(); i++) { for (int i = 0; i < anim->get_track_count(); i++) {
NodePath track_np = anim->track_get_path(i); NodePath track_np = anim->track_get_path(i);
Node *n = root->get_node_or_null(track_np); Node *n = root->get_node_or_null(track_np);
@ -1755,14 +1757,8 @@ void SceneTreeDock::perform_node_renames(Node *p_base, HashMap<Node *, NodePath>
if (found_path->value.is_empty()) { if (found_path->value.is_empty()) {
//will be erased //will be erased
int idx = 0; int idx = i - tracks_removed;
HashSet<int>::Iterator EI = ran.begin(); tracks_removed++;
ERR_FAIL_COND(!EI); //bug
while (*EI != i) {
idx++;
++EI;
ERR_FAIL_COND(!EI); //another bug
}
undo_redo->add_do_method(anim.ptr(), "remove_track", idx); undo_redo->add_do_method(anim.ptr(), "remove_track", idx);
undo_redo->add_undo_method(anim.ptr(), "add_track", anim->track_get_type(i), idx); undo_redo->add_undo_method(anim.ptr(), "add_track", anim->track_get_type(i), idx);