From cd45f05f7e930869fb8d58c62e5f866470b73e1a Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Tue, 22 Jan 2019 13:49:03 -0300 Subject: [PATCH] Forbid making root on inherited scenes, closes #24484 --- editor/scene_tree_dock.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index be1c4a36bd..738d747956 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -565,6 +565,12 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { //check that from node to root, all owners are right + if (root->get_scene_inherited_state().is_valid()) { + accept->set_text(TTR("Can't reparent nodes in inherited scenes, order of nodes can't change.")); + accept->popup_centered_minsize(); + return; + } + if (node->get_owner() != root) { accept->set_text(TTR("Node must belong to the edited scene to become root.")); accept->popup_centered_minsize();