diff options
| author | cdemirer <41021322+cdemirer@users.noreply.github.com> | 2022-01-18 00:37:17 +0800 |
|---|---|---|
| committer | cdemirer <41021322+cdemirer@users.noreply.github.com> | 2022-01-18 00:37:17 +0800 |
| commit | 31a6ad83fd316bc26bd54903f9035ddf0bca7d5b (patch) | |
| tree | ea07010265ff4a1003cfb32a969a8ee2acaa99ce | |
| parent | f1ca14cc8daf7529569a11c9209c18f8f73e837a (diff) | |
Editor: Disallow reparenting inherited nodes
| -rw-r--r-- | editor/scene_tree_dock.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 1934850160..538caa8d09 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -361,8 +361,12 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { tree->edit_selected(); } } break; - case TOOL_NEW: - case TOOL_REPARENT_TO_NEW_NODE: { + case TOOL_REPARENT_TO_NEW_NODE: + if (!_validate_no_foreign()) { + break; + } + [[fallthrough]]; + case TOOL_NEW: { if (!profile_allow_editing) { break; } @@ -2603,6 +2607,10 @@ void SceneTreeDock::_script_dropped(String p_file, NodePath p_to) { } void SceneTreeDock::_nodes_dragged(Array p_nodes, NodePath p_to, int p_type) { + if (!_validate_no_foreign()) { + return; + } + List<Node *> selection = editor_selection->get_selected_node_list(); if (selection.is_empty()) { |