Forbid making root on inherited scenes, closes godotengine#24484

slapin · Jan 28, 2019 · 75fe094 · 75fe094
1 parent e078686
commit 75fe094
Showing 1 changed file with 6 additions and 0 deletions.
diff --git 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();