diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2022-01-07 01:16:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-07 01:16:17 +0100 |
commit | 897afb69a7f1130894d4e76857fb52ff5bd37544 (patch) | |
tree | b2f1f9eb343f06ae51bb0b8f0dd3bdcc9378e488 | |
parent | e1766da4bd9bf5de2229bac22f1455517d637c4d (diff) | |
parent | 9e095bb68bd7e4bbe1ab9eff422d80683bd6656b (diff) |
Merge pull request #56578 from KoBeWi/sibling_from_hell
-rw-r--r-- | editor/scene_tree_dock.cpp | 2 | ||||
-rw-r--r-- | modules/gltf/gltf_document.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 2d21caeac0..7e72777da1 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -726,7 +726,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { dup->set_name(parent->validate_child_name(dup)); - editor_data->get_undo_redo().add_do_method(add_below_node, "add_sibling", dup); + editor_data->get_undo_redo().add_do_method(add_below_node, "add_sibling", dup, true); for (Node *F : owned) { if (!duplimap.has(F)) { diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp index 833bcb00e6..0d41ff025e 100644 --- a/modules/gltf/gltf_document.cpp +++ b/modules/gltf/gltf_document.cpp @@ -6851,7 +6851,7 @@ Node *GLTFDocument::generate_scene(Ref<GLTFState> state, int32_t p_bake_fps) { _process_mesh_instances(state, root); if (state->animations.size()) { AnimationPlayer *ap = memnew(AnimationPlayer); - root->add_child(ap); + root->add_child(ap, true); ap->set_owner(root); for (int i = 0; i < state->animations.size(); i++) { _import_animation(state, ap, i, p_bake_fps); |