From d81b8e4a86d6b9dc15fe1bc6110e1006123e9db9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 13 Nov 2020 13:41:15 +0100 Subject: [PATCH] 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) --- editor/scene_tree_dock.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 248233dbcff..48fe430910a 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -1279,10 +1279,6 @@ void SceneTreeDock::_fill_path_renames(Vector base_path, Vector > *p_renames) { - - if (!bool(EDITOR_DEF("editors/animation/autorename_animation_tracks", true))) - return; - Vector base_path; Node *n = p_node->get_parent(); while (n) {