summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2020-11-13 13:41:15 +0100
committerRémi Verschelde <rverschelde@gmail.com>2020-11-13 13:41:33 +0100
commitd107fd4c9e198e6100eb683ee4fb13d5c6b3ba31 (patch)
tree075ca57ce4b91d24d768919bb498b5b8419985fd
parentf73374629dd57d3eea6a960859ca223fa2d95fc4 (diff)
SceneTree: Fix reparent crash with animation tracks renaming disabled
This check was there since the first commit in 2014, but a later feature added in 2018 with #17717 did not properly update the code while adding non animation-related code in `perform_node_renames`. Fixes #40532.
-rw-r--r--editor/scene_tree_dock.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp
index add5047c99..038b18a648 100644
--- a/editor/scene_tree_dock.cpp
+++ b/editor/scene_tree_dock.cpp
@@ -1270,10 +1270,6 @@ void SceneTreeDock::_fill_path_renames(Vector<StringName> base_path, Vector<Stri
}
void SceneTreeDock::fill_path_renames(Node *p_node, Node *p_new_parent, List<Pair<NodePath, NodePath>> *p_renames) {
- if (!bool(EDITOR_DEF("editors/animation/autorename_animation_tracks", true))) {
- return;
- }
-
Vector<StringName> base_path;
Node *n = p_node->get_parent();
while (n) {