Browse Source

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.

(cherry picked from commit d107fd4c9e198e6100eb683ee4fb13d5c6b3ba31)
Rémi Verschelde 4 years ago
parent
commit
d81b8e4a86
1 changed files with 0 additions and 4 deletions
  1. 0 4
      editor/scene_tree_dock.cpp

+ 0 - 4
editor/scene_tree_dock.cpp

@@ -1279,10 +1279,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) {
 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;
 	Vector<StringName> base_path;
 	Node *n = p_node->get_parent();
 	Node *n = p_node->get_parent();
 	while (n) {
 	while (n) {