gaming/godot
gaming/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot synced 2024-09-18 20:11:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55809 from cdemirer/fix-reparenting-inherited-nodes

Browse source
This commit is contained in:
Rémi Verschelde 2022-01-18 10:54:59 +01:00 committed by GitHub
parent 453f4dbe46 31a6ad83fd
commit 5bc87025f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
editor/scene_tree_dock.cpp
View file

@ -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()) {