diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-01-18 10:54:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 10:54:59 +0100 |
| commit | 5bc87025f41566179352ae62478fcb2a141cfdb0 (patch) | |
| tree | 278abfaa0205793e147dd07b11ac4f776ef55ff2 | |
| parent | 453f4dbe46158fce959ab366d29514430fd40f03 (diff) | |
| parent | 31a6ad83fd316bc26bd54903f9035ddf0bca7d5b (diff) | |
Merge pull request #55809 from cdemirer/fix-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 2e72b17651..9d382e160c 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; } @@ -2621,6 +2625,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()) { |