summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2019-01-22 13:49:03 -0300
committerJuan Linietsky <reduzio@gmail.com>2019-01-22 13:49:03 -0300
commitcd45f05f7e930869fb8d58c62e5f866470b73e1a (patch)
tree3d86d21db6574d040d4b6fae25183d518bb241f6
parent0c9fd3c4b4f0cd22c6d887daf70bb882e2a00605 (diff)
Forbid making root on inherited scenes, closes #24484
-rw-r--r--editor/scene_tree_dock.cpp6
1 files changed, 6 insertions, 0 deletions
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();